Code

History

Commits on dependabot/github_actions/github-dependencies-763a00e5b4 to cli/tests/test_diffedit_command.rs35+
  1. tests: Update multiline inline snapshot valuesJoseph Lou committed 2 months ago8d9c58a
  2. copies: keep renames detected against multiple merge parentshexbinoct committed 4 months agob4d6348
  3. logging: Add trailing periods in log messagesJoseph Lou committed 4 months agod6c4fa8
  4. logging: Remove trailing periods in some log messagesJoseph Lou committed 4 months agobadd164
  5. diffedit: support "file-by-file" invocation modeAlex Jaspersen committed 5 months ago281e90e
  6. tests: Replace Result.unwrap with ? operator in test functionsGaëtan Lehmann committed 7 months agoacee40c
  7. tests: run `cargo insta test --force-update-snapshots`Ilya Grigoriev committed 8 months ago3a9e56d
  8. git_backend: use first tree as base tree for conflictsScott Taylor committed 1 year agoc1ecf8a
  9. rewrite: add conflict labels when merging commit treesScott Taylor committed 1 year ago04a9121
  10. conflicts: update conflict marker formatScott Taylor committed 11 months agoba73442
  11. revset: enable glob string matching by defaultYuya Nishihara committed 12 months ago97375fa
  12. tests: update cargo insta snapshotsTheo Buehler committed 11 months agocfb6509
  13. tests: exercise reverse-order diffedit and --toDavid Higgs committed 11 months agoaab4903
  14. docs: jj-vcs.github.io -> jj-vcs.devSteve Klabnik committed 11 months ago5b3aa51
  15. tests: specify string pattern prefix, use subject(glob:_) accordinglyYuya Nishihara committed 12 months ago3b37ed1
  16. tests: do not use "jj undo" to run multiple tests with the same setupYuya Nishihara committed 1 year agob384097
  17. tests: insert explicit snapshot after setting up test workspaceYuya Nishihara committed 1 year ago827a87f
  18. diff_working_copies: Simplify tree checkout functionsIan Wrzesinski committed 1 year agoab8bf20
  19. diffedit: add support for filesetsGeorge Christou committed 1 year agof7377bd
  20. local working copy: add support for EOL conversionKaiyi Li committed 1 year agof1f1556
  21. git: write change-id header by defaultMartin von Zweigbergk committed 1 year agoacd8242
  22. 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
  23. cli: Print @ and @- in status and print_updated_working_copy_statsRobin Stocker committed 1 year ago0456701
  24. cli: do not print commit summary for previously-conflicted commitsYuya Nishihara committed 1 year ago00c2d15
  25. tests: port test_diffedit_command.rs to TestWorkDir APIYuya Nishihara committed 1 year agoaeb80d2
  26. tests: configure fake editor early in test_diff*_command.rsYuya Nishihara committed 1 year agofc84c63
  27. tests: run `insta --force-update-snapshots`Ilya Grigoriev committed 1 year ago5eae2d9
  28. tests: resolve directory path to run_jj_in() relative to env_rootYuya Nishihara committed 1 year ago7fa8420
  29. tests: migrate non-snapshot users of jj_cmd_ok() to run_jj_in().success()Yuya Nishihara committed 1 year ago804d175
  30. tests: migrate snapshot users of jj_cmd_ok() to run_jj_in()Yuya Nishihara committed 1 year ago3193513
  31. tests: migrate snapshot users of jj_cmd_success() to run_jj_in()Yuya Nishihara committed 1 year agocdcc777
  32. tests: migrate users of normalize_exit_status() to run_jj_in() functionYuya Nishihara committed 1 year agocf7f1df
  33. cli: render "conflicts" message as warningYuya Nishihara committed 1 year agoa2a9a99
  34. cli: status: reorder conflict message to match checkout statsYuya Nishihara committed 1 year ago067e2eb
  35. tests: add [EOF] marker to command output when displayingYuya Nishihara committed 1 year ago630036e