Code

History

Commits on wd/combined-diff to cli/tests/test_interdiff_command.rs24
  1. cli: support combined diff in :git style diffYuantao Wang committed 9 months ago4f1592e
  2. rewrite: use `MergedTree::merge` in `rebase_to_dest_parent()`Scott Taylor committed 10 months agoe61f70e
  3. conflicts: update conflict marker formatScott Taylor committed 11 months agoba73442
  4. cli: `jj interdiff` warns when fileset doesn't existTejas Sanap committed 1 year agocbfdb45
  5. cli: include diff of commit descriptions in inter-diffYuya Nishihara committed 2 years ago939b093
  6. tests: do not use "jj undo" to run multiple tests with the same setupYuya Nishihara committed 1 year agob384097
  7. diff: add option to render color-words diffs without materializing conflictsYuya Nishihara committed 2 years agob63ab33
  8. tests: port test_interdiff_command.rs to TestWorkDir APIYuya Nishihara committed 1 year ago7f1bc15
  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_success() to run_jj_in()Yuya Nishihara committed 1 year agocdcc777
  12. tests: add [EOF] marker to command output when displayingYuya Nishihara committed 1 year ago630036e
  13. bookmarks: First step to make target revision a required argument to bookmark create/move/set.David Rieber committed 1 year agodd73b5a
  14. cli: delete deprecated `jj checkout` commandAustin Seipp committed 1 year ago0371341
  15. everything: Rename `branches` to `bookmarks`Philip Metzger committed 2 years agod9c68e0
  16. diff: fix typo in Git diff "index old..new" headerYuya Nishihara committed 2 years ago07a6a80
  17. conflicts: label closing delimeter with conflict numberIlya Grigoriev committed 2 years ago1f7c4ec
  18. tests: avoid deprecated `jj init --git/--git-repo`Martin von Zweigbergk committed 2 years agofe9daac
  19. conflicts.rs: label conflict number and sides next to conflict markersIlya Grigoriev committed 2 years ago70b517c
  20. compile integration tests as a single binaryjyn committed 2 years agod66fcf2
  21. tests: replace jj_cmd_success() involving mutation to allow stderr outputYuya Nishihara committed 3 years ago58acc1d
  22. revset: convert root symbol to functionYuya Nishihara committed 3 years agoe3c85d6
  23. diff_util: use `MergedTree` throughoutMartin von Zweigbergk committed 3 years ago732e448
  24. tests: move `tests/` under `cli/` so they're run againMartin von Zweigbergk committed 3 years ago0075174