Code

History

Commits on git-colocate to cli/tests/test_diffedit_command.rs29
  1. diffedit: add --restore-descendants flagSamuel Tardieu committed 2 years agof76ee18
  2. everything: Rename `branches` to `bookmarks`Philip Metzger committed 2 years agod9c68e0
  3. formatting only: switch to Item level import ganularityMatt Kulukundis committed 2 years ago8ead72e
  4. copy-tracking: add support for `diff --git`Matt Kulukundis committed 2 years ago95e8dd5
  5. diff: fix typo in Git diff "index old..new" headerYuya Nishihara committed 2 years ago07a6a80
  6. cli: skip formatting instructions if not requiredScott Taylor committed 2 years agob27ff28
  7. commit_builder: reset author timestamp on discardable commitsScott Taylor committed 2 years ago1eebbe5
  8. cli: rename `jj file print` (formerly `jj cat`) to `jj file show`Ilya Grigoriev committed 2 years agoe6c2108
  9. feat: Create a `file` command containing `print` and `chmod`Matt Kulukundis committed 2 years ago47bd6f4
  10. conflicts: label closing delimeter with conflict numberIlya Grigoriev committed 2 years ago1f7c4ec
  11. tests: avoid deprecated `jj init --git/--git-repo`Martin von Zweigbergk committed 2 years agofe9daac
  12. merge_tools: leverage Display for printing exit statusYuya Nishihara committed 2 years agob0d17ac
  13. conflicts.rs: label conflict number and sides next to conflict markersIlya Grigoriev committed 2 years ago70b517c
  14. git_backend: add a README to conflicted commitsMartin von Zweigbergk committed 2 years ago9d7ed54
  15. cli: print conflicted paths whenever the working copy is changedBenjamin Tan committed 2 years ago7e46cc1
  16. git_backend: write trees involved in conflict in git commit headerMartin von Zweigbergk committed 2 years ago4d42604
  17. tests: avoid deprecated `jj co`Martin von Zweigbergk committed 2 years ago4d5d5c4
  18. cli: add --tool=<name> option to diff/merge editing commandsYuya Nishihara committed 2 years ago7ce25f8
  19. merge_tools: process "ui.diff-instructions" option by callerYuya Nishihara committed 2 years ago529acb3
  20. cli: rename --verbose to --debug to better fit what it doesAlexis (Poliorcetics) Bourget committed 2 years ago0fc5005
  21. compile integration tests as a single binaryjyn committed 2 years agod66fcf2
  22. cli: preserve source of user error, print source chain one by oneYuya Nishihara committed 2 years ago30666df
  23. cli: change `R` to `D` for "deleted" in diff summaryIlya Grigoriev committed 2 years agobef2eca
  24. cli: send status messages to stderr, specify stdout/stderr explicitlyYuya Nishihara committed 3 years ago7a3e724
  25. tests: replace jj_cmd_success() involving mutation to allow stderr outputYuya Nishihara committed 3 years ago58acc1d
  26. cli: enable tree-level conflicts by defaultMartin von Zweigbergk committed 3 years ago2ccb17b
  27. merge_tools: Allow 3-pane diff editingIlya Grigoriev committed 3 years ago038867f
  28. test_diffedit_command: Show that diffedit ignores unknown filesIlya Grigoriev committed 3 years agofdf1a56
  29. tests: move `tests/` under `cli/` so they're run againMartin von Zweigbergk committed 3 years ago0075174