Code

History

Commits on ig/commit-debug to cli/src/merge_tools/mod.rs35+
  1. cargo: bump MSRV to 1.88Austin Seipp committed 1 year ago419bd51
  2. cli: diff: pass left/right trees as array to reduce number of argumentsYuya Nishihara committed 1 year ago91e5bef
  3. cli, lib: move to Rust 2024 language editionAustin Seipp committed 1 year agoba24140
  4. cli lib: make use of `Self` consistentadamnemecek committed 1 year ago8a26df2
  5. merge_tools: builtin: preserve unmatched paths from right treeGeorge Christou committed 1 year agof20e99b
  6. cli merge tools: allow setting `edit-args=[]` to disable diff editing with a toolIlya Grigoriev committed 1 year agodae9ce7
  7. cli merge tools: rename internal `DiffTool` type to `DiffEditTool`Ilya Grigoriev committed 1 year ago1b16132
  8. cli completion: complete `--tool` args for merge toolsIlya Grigoriev committed 1 year ago1161e95
  9. backend: add CopyId to TreeValue::FileMartin von Zweigbergk committed 1 year agoa363e6b
  10. cli: add CommandNameAndArgs::as_str() helperYuya Nishihara committed 1 year agof0386e2
  11. diff: Run external diff tools in their temp dirEyvind Bernhardsen committed 1 year ago94f28e9
  12. cli: resolve: do not use .with_new_file_ids() to construct resolved file valueYuya Nishihara committed 1 year agofa00775
  13. cli: resolve: error out early if conflict in exec bit couldn't be resolvedYuya Nishihara committed 1 year agoace0a52
  14. cli: resolve: update "not normal files" error message and formattingYuya Nishihara committed 1 year ago1e94ee2
  15. cli: resolve: use try_materialize_file_conflict_value()Yuya Nishihara committed 1 year agod2caf6f
  16. merge_tools: fix `:ours` and `:theirs` merge toolsScott Taylor committed 1 year ago12add9b
  17. merge_tools: rename `content` to `simplified_file_content`Scott Taylor committed 1 year agoa7b112e
  18. merge_tools: add ":ours" and ":theirs" merge toolsScott Taylor committed 1 year agoa902e63
  19. merge_tools: split `DiffTool` and `MergeTool` enumsScott Taylor committed 1 year ago238a558
  20. cleanup: enable `unused_trait_names` clippy lint and run `clippy --fix`Ilya Grigoriev committed 1 year agoacaedc3
  21. tests: run `insta --force-update-snapshots`Ilya Grigoriev committed 1 year ago5eae2d9
  22. resolve: try to resolve all conflicted files in filesetScott Taylor committed 1 year ago7df0f16
  23. merge_tools: extract `MergeToolFile` structScott Taylor committed 1 year ago5f77edf
  24. diff: add `merge-tools.*.diff-expected-exit-codes`Bryce Berger committed 1 year agob1b2c62
  25. cli: fix interactive diff selection to not retain unmatched filesYuya Nishihara committed 1 year ago0d022f1
  26. config: extract jj-lib's default values to embedded TOML fileYuya Nishihara committed 1 year agoe4a350f
  27. settings: propagate error from UserSettings::from_config()Yuya Nishihara committed 1 year ago4f08c62
  28. cli: load default/command-arg layers per source, clean up return typesYuya Nishihara committed 1 year ago4e1b71b
  29. config: introduce our ConfigGetError typeYuya Nishihara committed 1 year agoc0ce880
  30. config: move ConfigResultExt from settings moduleYuya Nishihara committed 1 year agoba739b2
  31. merge_tools: add merge-conflict-exit-codes optionScott Taylor committed 1 year agofa7d9c0
  32. cli: migrate remainder of Config::get() to StackedConfig::get()Yuya Nishihara committed 1 year ago4134511
  33. cli: leverage new settings.get(path) in merge-tools lookupYuya Nishihara committed 1 year ago94c6d6e
  34. settings: migrate get() to StackedConfig, rename .stacked_config to .configYuya Nishihara committed 1 year ago3890e42
  35. settings: forward .get_table(key) to underlying config objectYuya Nishihara committed 1 year ago5946ef3