Code

History

Commits on ig/vimdiffwarn to cli/tests/test_restore_command.rs35+
  1. tests: port test_restore_command.rs to TestWorkDir APIYuya Nishihara committed 1 year ago4d4de68
  2. tests: set up fake editor early in test_{resolve,restore}_command.rsYuya Nishihara committed 1 year ago169a8b3
  3. cli: Print @ and @- in status and print_updated_working_copy_statsRobin Stocker committed 1 year ago0456701
  4. cli: truncate list of newly conflicted commitsYuya Nishihara committed 1 year agoc2f2461
  5. tests: pass &TestWorkDir to create_commit*() helperYuya Nishihara committed 1 year ago61a4495
  6. cli tests: move `create_commit()` tests helpers to common/Martin von Zweigbergk committed 1 year ago0055cd4
  7. tests: run `insta --force-update-snapshots`Ilya Grigoriev committed 1 year ago5eae2d9
  8. tests: normalize formatting in insta macro that could leave trailing whitespaceYuya Nishihara committed 1 year ago2fd842e
  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_ok() to run_jj_in()Yuya Nishihara committed 1 year ago3193513
  12. tests: migrate snapshot users of jj_cmd_success() to run_jj_in()Yuya Nishihara committed 1 year agocdcc777
  13. tests: migrate callers of jj_cmd_failure() to run_jj_in()Yuya Nishihara committed 1 year agod19e58f
  14. tests: migrate some jj_cmd_success() output wrappers to run_jj_in()Yuya Nishihara committed 1 year agof1cd3a4
  15. tests: migrate some helper functions that uses jj_cmd_*() to run_jj_in()Yuya Nishihara committed 1 year ago18ea718
  16. cli: add "Hint: " prefix to conflict hintsYuya Nishihara committed 1 year ago48b0222
  17. cli: render "conflicts" message as warningYuya Nishihara committed 1 year agoa2a9a99
  18. tests: add [EOF] marker to command output when displayingYuya Nishihara committed 1 year ago630036e
  19. tests: add CommandOutputString wrapperYuya Nishihara committed 1 year agoa541652
  20. bookmarks: First step to make target revision a required argument to bookmark create/move/set.David Rieber committed 1 year agodd73b5a
  21. restore: add --into flag, make --to an alias to itValentin Gatien-Baron committed 1 year ago019bd8f
  22. cli: restore: add --interactive flagYuya Nishihara committed 1 year ago2cb3ee5
  23. docs/cli: update URLs to from martinvonz user to jj-vcs orgMartin von Zweigbergk committed 1 year agob836e0a
  24. diff: fix unified diff to emit one-lower start line number for empty hunksYuya Nishihara committed 1 year ago8c4ba4a
  25. restore: add --restore-descendants flagSamuel Tardieu committed 2 years agocf7847d
  26. cli: reorder updating and reporting for consistency.Essien Ita Essien committed 2 years ago76f40e5
  27. conflicts: Highlight change ids in rebase adviceLukas Wirth committed 2 years agobccd821
  28. everything: Rename `branches` to `bookmarks`Philip Metzger committed 2 years agod9c68e0
  29. cli_util: add missing word in conflict resolution instructionsVincent Ging Ho Yim committed 2 years ago79b326d
  30. Enable the new graph nodes by default.Anton Älgmyr committed 2 years agoc7eac90
  31. commit_builder: reset author timestamp on discardable commitsScott Taylor committed 2 years ago1eebbe5
  32. conflicts: label closing delimeter with conflict numberIlya Grigoriev committed 2 years ago1f7c4ec
  33. tests: avoid deprecated `jj init --git/--git-repo`Martin von Zweigbergk committed 2 years agofe9daac
  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