Code

History

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