Code

History

Commits on CacheMyWorkingCopy to cli/tests/test_resolve_command.rs15
  1. cli: add --tool=<name> option to diff/merge editing commandsYuya Nishihara committed 2 years ago7ce25f8
  2. merge_tools: load diff/merge editor settings by callerYuya Nishihara committed 2 years ago003b40d
  3. cli: rename --verbose to --debug to better fit what it doesAlexis (Poliorcetics) Bourget committed 2 years ago0fc5005
  4. compile integration tests as a single binaryjyn committed 2 years agod66fcf2
  5. cli: preserve source of user error, print source chain one by oneYuya Nishihara committed 2 years ago30666df
  6. cli: display which file's conflicts are being resolvedStephen Jennings committed 2 years ago57d5aba
  7. cli: print a hint about how to resolve conflictsMartin von Zweigbergk committed 2 years agoa88b3dd
  8. cli: print a message about new and resolved conflictsMartin von Zweigbergk committed 2 years ago2dae5f5
  9. cli: send status messages to stderr, specify stdout/stderr explicitlyYuya Nishihara committed 3 years ago7a3e724
  10. tests: replace jj_cmd_success() involving mutation to allow stderr outputYuya Nishihara committed 3 years ago58acc1d
  11. cli: enable tree-level conflicts by defaultMartin von Zweigbergk committed 3 years ago2ccb17b
  12. merge_tools: create builtin merge editorWaleed Khan committed 3 years ago393b035
  13. revset: convert root symbol to functionYuya Nishihara committed 3 years agoe3c85d6
  14. cli templates: include branches in short commit descriptionIlya Grigoriev committed 3 years ago6fa8a25
  15. tests: move `tests/` under `cli/` so they're run againMartin von Zweigbergk committed 3 years ago0075174