Code

History

Commits on ig/vimdiffwarn to cli/tests/test_diffedit_command.rs35+
  1. cli: Print @ and @- in status and print_updated_working_copy_statsRobin Stocker committed 1 year ago0456701
  2. cli: do not print commit summary for previously-conflicted commitsYuya Nishihara committed 1 year ago00c2d15
  3. tests: port test_diffedit_command.rs to TestWorkDir APIYuya Nishihara committed 1 year agoaeb80d2
  4. tests: configure fake editor early in test_diff*_command.rsYuya Nishihara committed 1 year agofc84c63
  5. tests: run `insta --force-update-snapshots`Ilya Grigoriev committed 1 year ago5eae2d9
  6. tests: resolve directory path to run_jj_in() relative to env_rootYuya Nishihara committed 1 year ago7fa8420
  7. tests: migrate non-snapshot users of jj_cmd_ok() to run_jj_in().success()Yuya Nishihara committed 1 year ago804d175
  8. tests: migrate snapshot users of jj_cmd_ok() to run_jj_in()Yuya Nishihara committed 1 year ago3193513
  9. tests: migrate snapshot users of jj_cmd_success() to run_jj_in()Yuya Nishihara committed 1 year agocdcc777
  10. tests: migrate users of normalize_exit_status() to run_jj_in() functionYuya Nishihara committed 1 year agocf7f1df
  11. cli: render "conflicts" message as warningYuya Nishihara committed 1 year agoa2a9a99
  12. cli: status: reorder conflict message to match checkout statsYuya Nishihara committed 1 year ago067e2eb
  13. tests: add [EOF] marker to command output when displayingYuya Nishihara committed 1 year ago630036e
  14. tests: add CommandOutputString wrapperYuya Nishihara committed 1 year agoa541652
  15. bookmarks: First step to make target revision a required argument to bookmark create/move/set.David Rieber committed 1 year agodd73b5a
  16. cli: status: replace "is clean" by "has no changes"Martin von Zweigbergk committed 1 year ago1e25101
  17. tests: leverage set_up_fake_diff_editor() in test_diffedit_3pane()Yuya Nishihara committed 2 years ago124970c
  18. docs/cli: update URLs to from martinvonz user to jj-vcs orgMartin von Zweigbergk committed 1 year agob836e0a
  19. cli: replace --config-toml=TOML with --config=NAME=VALUEYuya Nishihara committed 1 year agoabf4857
  20. diff: fix unified diff to emit one-lower start line number for empty hunksYuya Nishihara committed 1 year ago8c4ba4a
  21. merge_tools: allow setting conflict marker style per-toolScott Taylor committed 1 year ago7f57866
  22. diffedit: add --restore-descendants flagSamuel Tardieu committed 2 years agof76ee18
  23. everything: Rename `branches` to `bookmarks`Philip Metzger committed 2 years agod9c68e0
  24. formatting only: switch to Item level import ganularityMatt Kulukundis committed 2 years ago8ead72e
  25. copy-tracking: add support for `diff --git`Matt Kulukundis committed 2 years ago95e8dd5
  26. diff: fix typo in Git diff "index old..new" headerYuya Nishihara committed 2 years ago07a6a80
  27. cli: skip formatting instructions if not requiredScott Taylor committed 2 years agob27ff28
  28. commit_builder: reset author timestamp on discardable commitsScott Taylor committed 2 years ago1eebbe5
  29. cli: rename `jj file print` (formerly `jj cat`) to `jj file show`Ilya Grigoriev committed 2 years agoe6c2108
  30. feat: Create a `file` command containing `print` and `chmod`Matt Kulukundis committed 2 years ago47bd6f4
  31. conflicts: label closing delimeter with conflict numberIlya Grigoriev committed 2 years ago1f7c4ec
  32. tests: avoid deprecated `jj init --git/--git-repo`Martin von Zweigbergk committed 2 years agofe9daac
  33. merge_tools: leverage Display for printing exit statusYuya Nishihara committed 2 years agob0d17ac
  34. conflicts.rs: label conflict number and sides next to conflict markersIlya Grigoriev committed 2 years ago70b517c
  35. git_backend: add a README to conflicted commitsMartin von Zweigbergk committed 2 years ago9d7ed54