Code

History

Commits on ig/commit-debug to cli/tests/test_resolve_command.rs80
  1. cli: display which file's conflicts are being resolvedStephen Jennings committed 2 years ago57d5aba
  2. cli: print a hint about how to resolve conflictsMartin von Zweigbergk committed 2 years agoa88b3dd
  3. cli: print a message about new and resolved conflictsMartin von Zweigbergk committed 2 years ago2dae5f5
  4. cli: send status messages to stderr, specify stdout/stderr explicitlyYuya Nishihara committed 3 years ago7a3e724
  5. tests: replace jj_cmd_success() involving mutation to allow stderr outputYuya Nishihara committed 3 years ago58acc1d
  6. cli: enable tree-level conflicts by defaultMartin von Zweigbergk committed 3 years ago2ccb17b
  7. merge_tools: create builtin merge editorWaleed Khan committed 3 years ago393b035
  8. revset: convert root symbol to functionYuya Nishihara committed 3 years agoe3c85d6
  9. cli templates: include branches in short commit descriptionIlya Grigoriev committed 3 years ago6fa8a25
  10. tests: move `tests/` under `cli/` so they're run againMartin von Zweigbergk committed 3 years ago0075174