Code

History

Commits on wd/combined-diff to cli/tests/test_diffedit_command.rs35+
  1. rewrite: add conflict labels when merging commit treesScott Taylor committed 1 year ago04a9121
  2. conflicts: update conflict marker formatScott Taylor committed 11 months agoba73442
  3. revset: enable glob string matching by defaultYuya Nishihara committed 12 months ago97375fa
  4. tests: update cargo insta snapshotsTheo Buehler committed 11 months agocfb6509
  5. tests: exercise reverse-order diffedit and --toDavid Higgs committed 11 months agoaab4903
  6. docs: jj-vcs.github.io -> jj-vcs.devSteve Klabnik committed 11 months ago5b3aa51
  7. tests: specify string pattern prefix, use subject(glob:_) accordinglyYuya Nishihara committed 12 months ago3b37ed1
  8. tests: do not use "jj undo" to run multiple tests with the same setupYuya Nishihara committed 1 year agob384097
  9. tests: insert explicit snapshot after setting up test workspaceYuya Nishihara committed 1 year ago827a87f
  10. diff_working_copies: Simplify tree checkout functionsIan Wrzesinski committed 1 year agoab8bf20
  11. diffedit: add support for filesetsGeorge Christou committed 1 year agof7377bd
  12. local working copy: add support for EOL conversionKaiyi Li committed 1 year agof1f1556
  13. git: write change-id header by defaultMartin von Zweigbergk committed 1 year agoacd8242
  14. restore, diffedit: do not output "Created ..." message, which dates back to before we couldn't lookup by change id.Steve Fink committed 1 year ago0eceed9
  15. cli: Print @ and @- in status and print_updated_working_copy_statsRobin Stocker committed 1 year ago0456701
  16. cli: do not print commit summary for previously-conflicted commitsYuya Nishihara committed 1 year ago00c2d15
  17. tests: port test_diffedit_command.rs to TestWorkDir APIYuya Nishihara committed 1 year agoaeb80d2
  18. tests: configure fake editor early in test_diff*_command.rsYuya Nishihara committed 1 year agofc84c63
  19. tests: run `insta --force-update-snapshots`Ilya Grigoriev committed 1 year ago5eae2d9
  20. tests: resolve directory path to run_jj_in() relative to env_rootYuya Nishihara committed 1 year ago7fa8420
  21. tests: migrate non-snapshot users of jj_cmd_ok() to run_jj_in().success()Yuya Nishihara committed 1 year ago804d175
  22. tests: migrate snapshot users of jj_cmd_ok() to run_jj_in()Yuya Nishihara committed 1 year ago3193513
  23. tests: migrate snapshot users of jj_cmd_success() to run_jj_in()Yuya Nishihara committed 1 year agocdcc777
  24. tests: migrate users of normalize_exit_status() to run_jj_in() functionYuya Nishihara committed 1 year agocf7f1df
  25. cli: render "conflicts" message as warningYuya Nishihara committed 1 year agoa2a9a99
  26. cli: status: reorder conflict message to match checkout statsYuya Nishihara committed 1 year ago067e2eb
  27. tests: add [EOF] marker to command output when displayingYuya Nishihara committed 1 year ago630036e
  28. tests: add CommandOutputString wrapperYuya Nishihara committed 1 year agoa541652
  29. bookmarks: First step to make target revision a required argument to bookmark create/move/set.David Rieber committed 1 year agodd73b5a
  30. cli: status: replace "is clean" by "has no changes"Martin von Zweigbergk committed 1 year ago1e25101
  31. tests: leverage set_up_fake_diff_editor() in test_diffedit_3pane()Yuya Nishihara committed 2 years ago124970c
  32. docs/cli: update URLs to from martinvonz user to jj-vcs orgMartin von Zweigbergk committed 1 year agob836e0a
  33. cli: replace --config-toml=TOML with --config=NAME=VALUEYuya Nishihara committed 1 year agoabf4857
  34. diff: fix unified diff to emit one-lower start line number for empty hunksYuya Nishihara committed 1 year ago8c4ba4a
  35. merge_tools: allow setting conflict marker style per-toolScott Taylor committed 1 year ago7f57866