Code

History

Commits on git-sync to cli/tests/test_resolve_command.rs35+
  1. logging: Add trailing periods in log messagesJoseph Lou committed 4 months agod6c4fa8
  2. logging: Remove trailing periods in some log messagesJoseph Lou committed 4 months agobadd164
  3. tests: Replace Result.unwrap with ? operator in test functionsGaëtan Lehmann committed 7 months agoacee40c
  4. tests: run `cargo insta test --force-update-snapshots`Ilya Grigoriev committed 8 months ago3a9e56d
  5. git_backend: use first tree as base tree for conflictsScott Taylor committed 1 year agoc1ecf8a
  6. tests: exercise successful resolve of non-@ revisionDavid Higgs committed 10 months agoaeb492c
  7. merge: include conflict labels when describing non-file conflictsScott Taylor committed 10 months ago34a1f86
  8. templates: add "divergent" label to log for divergent changesScott Taylor committed 11 months ago33ad38b
  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. tests: update cargo insta snapshotsTheo Buehler committed 11 months agocfb6509
  12. tests: exercise resolve for other revisionsDavid Higgs committed 11 months ago914edae
  13. docs: jj-vcs.github.io -> jj-vcs.devSteve Klabnik committed 11 months ago5b3aa51
  14. cli: `jj resolve` warns when fileset doesn't existTejas Sanap committed 1 year agofc65d35
  15. external_merge: pass the repo_path to the merge toolAntonin Delpeuch committed 1 year ago589ed83
  16. tests: do not use "jj undo" to run multiple tests with the same setupYuya Nishihara committed 1 year agob384097
  17. cli, lib: move to Rust 2024 language editionAustin Seipp committed 1 year agoba24140
  18. backend: add CopyId to TreeValue::FileMartin von Zweigbergk committed 1 year agoa363e6b
  19. cli: use more precise wording in conflict resolution hintVincent Ging Ho Yim committed 1 year agof176518
  20. cli: resolve: show a hint towards editing the conflict markers manually if the conflict has >2 sidesWinter committed 1 year ago2d1f50a
  21. git: write change-id header by defaultMartin von Zweigbergk committed 1 year agoacd8242
  22. cli: resolve: do not use .with_new_file_ids() to construct resolved file valueYuya Nishihara committed 1 year agofa00775
  23. cli: resolve: error out early if conflict in exec bit couldn't be resolvedYuya Nishihara committed 1 year agoace0a52
  24. cli: resolve: update "not normal files" error message and formattingYuya Nishihara committed 1 year ago1e94ee2
  25. merge_tools: fix `:ours` and `:theirs` merge toolsScott Taylor committed 1 year ago12add9b
  26. merge_tools: demo issue with `:ours` and `:theirs`Scott Taylor committed 1 year ago466d237
  27. merge_tools: add ":ours" and ":theirs" merge toolsScott Taylor committed 1 year agoa902e63
  28. tests: port test_resolve_command.rs to TestWorkDir APIYuya Nishihara committed 1 year ago3ba2ea7
  29. tests: set up fake editor early in test_{resolve,restore}_command.rsYuya Nishihara committed 1 year ago169a8b3
  30. cli: Print @ and @- in status and print_updated_working_copy_statsRobin Stocker committed 1 year ago0456701
  31. cli: truncate list of newly conflicted commitsYuya Nishihara committed 1 year agoc2f2461
  32. tests: pass &TestWorkDir to create_commit*() helperYuya Nishihara committed 1 year ago61a4495
  33. cli tests: move `create_commit()` tests helpers to common/Martin von Zweigbergk committed 1 year ago0055cd4
  34. tests: run `insta --force-update-snapshots`Ilya Grigoriev committed 1 year ago5eae2d9
  35. tests: normalize formatting in insta macro that could leave trailing whitespaceYuya Nishihara committed 1 year ago2fd842e