Code

History

Commits on ig/vimdiffwarn to cli/tests/test_resolve_command.rs35+
  1. tests: port test_resolve_command.rs to TestWorkDir APIYuya Nishihara committed 1 year ago3ba2ea7
  2. tests: set up fake editor early in test_{resolve,restore}_command.rsYuya Nishihara committed 1 year ago169a8b3
  3. cli: Print @ and @- in status and print_updated_working_copy_statsRobin Stocker committed 1 year ago0456701
  4. cli: truncate list of newly conflicted commitsYuya Nishihara committed 1 year agoc2f2461
  5. tests: pass &TestWorkDir to create_commit*() helperYuya Nishihara committed 1 year ago61a4495
  6. cli tests: move `create_commit()` tests helpers to common/Martin von Zweigbergk committed 1 year ago0055cd4
  7. tests: run `insta --force-update-snapshots`Ilya Grigoriev committed 1 year ago5eae2d9
  8. tests: normalize formatting in insta macro that could leave trailing whitespaceYuya Nishihara committed 1 year ago2fd842e
  9. tests: resolve directory path to run_jj_in() relative to env_rootYuya Nishihara committed 1 year ago7fa8420
  10. tests: migrate non-snapshot users of jj_cmd_ok() to run_jj_in().success()Yuya Nishihara committed 1 year ago804d175
  11. tests: migrate snapshot users of jj_cmd_ok() to run_jj_in()Yuya Nishihara committed 1 year ago3193513
  12. tests: migrate snapshot users of jj_cmd_success() to run_jj_in()Yuya Nishihara committed 1 year agocdcc777
  13. tests: migrate callers of jj_cmd_cli_error() to run_jj_in()Yuya Nishihara committed 1 year agob79b29c
  14. tests: migrate callers of jj_cmd_failure() to run_jj_in()Yuya Nishihara committed 1 year agod19e58f
  15. tests: stop using assert_eq!() in cli tests where possibleYuya Nishihara committed 1 year ago696cfee
  16. tests: migrate some jj_cmd_success() output wrappers to run_jj_in()Yuya Nishihara committed 1 year agof1cd3a4
  17. tests: migrate some helper functions that uses jj_cmd_*() to run_jj_in()Yuya Nishihara committed 1 year ago18ea718
  18. tests: migrate users of normalize_exit_status() to run_jj_in() functionYuya Nishihara committed 1 year agocf7f1df
  19. cli: add "Hint: " prefix to conflict hintsYuya Nishihara committed 1 year ago48b0222
  20. cli: render "conflicts" message as warningYuya Nishihara committed 1 year agoa2a9a99
  21. tests: add [EOF] marker to command output when displayingYuya Nishihara committed 1 year ago630036e
  22. tests: add CommandOutputString wrapperYuya Nishihara committed 1 year agoa541652
  23. bookmarks: First step to make target revision a required argument to bookmark create/move/set.David Rieber committed 1 year agodd73b5a
  24. resolve: try to resolve all conflicted files in filesetScott Taylor committed 1 year ago7df0f16
  25. merge_tools: add "$marker_length" variableScott Taylor committed 1 year ago542d09c
  26. merge_tools: preserve executable bit on resolveScott Taylor committed 1 year ago7bf31c1
  27. resolve: demo executable bit being lostScott Taylor committed 1 year agoafa2f2d
  28. docs/cli: update URLs to from martinvonz user to jj-vcs orgMartin von Zweigbergk committed 1 year agob836e0a
  29. cli: replace --config-toml=TOML with --config=NAME=VALUEYuya Nishihara committed 1 year agoabf4857
  30. merge_tools: add merge-conflict-exit-codes optionScott Taylor committed 1 year agofa7d9c0
  31. merge_tools: allow setting conflict marker style per-toolScott Taylor committed 1 year ago7f57866
  32. cli: reorder updating and reporting for consistency.Essien Ita Essien committed 2 years ago76f40e5
  33. conflicts: Highlight change ids in rebase adviceLukas Wirth committed 2 years agobccd821
  34. everything: Rename `branches` to `bookmarks`Philip Metzger committed 2 years agod9c68e0
  35. cli_util: add missing word in conflict resolution instructionsVincent Ging Ho Yim committed 2 years ago79b326d