Code

History

Commits on ig/commit-debug to cli/tests/test_resolve_command.rs70+
  1. bookmarks: First step to make target revision a required argument to bookmark create/move/set.David Rieber committed 1 year agodd73b5a
  2. resolve: try to resolve all conflicted files in filesetScott Taylor committed 1 year ago7df0f16
  3. merge_tools: add "$marker_length" variableScott Taylor committed 1 year ago542d09c
  4. merge_tools: preserve executable bit on resolveScott Taylor committed 1 year ago7bf31c1
  5. resolve: demo executable bit being lostScott Taylor committed 1 year agoafa2f2d
  6. docs/cli: update URLs to from martinvonz user to jj-vcs orgMartin von Zweigbergk committed 1 year agob836e0a
  7. cli: replace --config-toml=TOML with --config=NAME=VALUEYuya Nishihara committed 1 year agoabf4857
  8. merge_tools: add merge-conflict-exit-codes optionScott Taylor committed 1 year agofa7d9c0
  9. merge_tools: allow setting conflict marker style per-toolScott Taylor committed 1 year ago7f57866
  10. cli: reorder updating and reporting for consistency.Essien Ita Essien committed 2 years ago76f40e5
  11. conflicts: Highlight change ids in rebase adviceLukas Wirth committed 2 years agobccd821
  12. everything: Rename `branches` to `bookmarks`Philip Metzger committed 2 years agod9c68e0
  13. cli_util: add missing word in conflict resolution instructionsVincent Ging Ho Yim committed 2 years ago79b326d
  14. Enable the new graph nodes by default.Anton Älgmyr committed 2 years agoc7eac90
  15. diff: fix typo in Git diff "index old..new" headerYuya Nishihara committed 2 years ago07a6a80
  16. merge_tools: simplify file conflicts before attempting to resolveBenjamin Tan committed 2 years ago7c9f28a
  17. test_resolve_command: accept filename in `check_resolve_produces_input_file`Benjamin Tan committed 2 years ago17c8daa
  18. print_conflicted_paths: simplify file conflicts before printingBenjamin Tan committed 2 years ago9d4ac81
  19. conflicts: materialize simplified file conflictsBenjamin Tan committed 2 years ago9be3372
  20. tests: add tests showing that individual file conflicts are not simplified/deduplicatedBenjamin Tan committed 2 years agof74991c
  21. conflicts: label closing delimeter with conflict numberIlya Grigoriev committed 2 years ago1f7c4ec
  22. tests: avoid deprecated `jj init --git/--git-repo`Martin von Zweigbergk committed 2 years agofe9daac
  23. conflicts.rs: label conflict number and sides next to conflict markersIlya Grigoriev committed 2 years ago70b517c
  24. test_resolve_command: use `diff --git` for readabilityIlya Grigoriev committed 2 years ago2f48f76
  25. git_backend: add a README to conflicted commitsMartin von Zweigbergk committed 2 years ago9d7ed54
  26. cli: print conflicted paths whenever the working copy is changedBenjamin Tan committed 2 years ago7e46cc1
  27. cli: add a global `--quiet` flag, which silences status messagesMartin von Zweigbergk committed 2 years agoadf3b50
  28. cli: add "Hint: " or "Warning: " heading to almost all messagesYuya Nishihara committed 2 years ago3152570
  29. test_conflicts and test_resolve_command: use `indoc!` to indent conflict markers in testsIlya Grigoriev committed 2 years ago02a04d0
  30. git_backend: write trees involved in conflict in git commit headerMartin von Zweigbergk committed 2 years ago4d42604
  31. cli: add --tool=<name> option to diff/merge editing commandsYuya Nishihara committed 2 years ago7ce25f8
  32. merge_tools: load diff/merge editor settings by callerYuya Nishihara committed 2 years ago003b40d
  33. cli: rename --verbose to --debug to better fit what it doesAlexis (Poliorcetics) Bourget committed 2 years ago0fc5005
  34. compile integration tests as a single binaryjyn committed 2 years agod66fcf2
  35. cli: preserve source of user error, print source chain one by oneYuya Nishihara committed 2 years ago30666df