Code

History

Commits on ig/vimdiffwarn to cli/src/merge_tools35+
  1. conflicts: pack MaterializedTreeValue::File fields, use read_all() helperYuya Nishihara committed 1 year agoe52ddda
  2. diff-editor: Always use Section::FileMode when creating or deleting filesJonathan Gilchrist committed 1 year ago153c972
  3. cleanup: enable `unused_trait_names` clippy lint and run `clippy --fix`Ilya Grigoriev committed 1 year agoacaedc3
  4. cli: resolve: leave executable bit unchanged when using external toolMartin von Zweigbergk committed 1 year agoa01d0bf
  5. tests: run `insta --force-update-snapshots`Ilya Grigoriev committed 1 year ago5eae2d9
  6. cli: delete unused variants of `BuiltinToolError`Martin von Zweigbergk committed 1 year agoea10adf
  7. resolve: try to resolve all conflicted files in filesetScott Taylor committed 1 year ago7df0f16
  8. merge_tools: extract `MergeToolFile` structScott Taylor committed 1 year ago5f77edf
  9. diff: add `merge-tools.*.diff-expected-exit-codes`Bryce Berger committed 1 year agob1b2c62
  10. cli: fix interactive diff selection to not retain unmatched filesYuya Nishihara committed 1 year ago0d022f1
  11. perf: use `.next_back()` to get the last componentSamuel Tardieu committed 1 year ago39bdd5e
  12. config: extract jj-lib's default values to embedded TOML fileYuya Nishihara committed 1 year agoe4a350f
  13. merge_tools: add "$marker_length" variableScott Taylor committed 1 year ago542d09c
  14. merge_tools: preserve executable bit on resolveScott Taylor committed 1 year ago7bf31c1
  15. local_working_copy: store materialized conflict marker lengthScott Taylor committed 1 year ago6baa436
  16. settings: propagate error from UserSettings::from_config()Yuya Nishihara committed 1 year ago4f08c62
  17. cli: load default/command-arg layers per source, clean up return typesYuya Nishihara committed 1 year ago4e1b71b
  18. config: introduce our ConfigGetError typeYuya Nishihara committed 1 year agoc0ce880
  19. config: move ConfigResultExt from settings moduleYuya Nishihara committed 1 year agoba739b2
  20. merge_tools: add merge-conflict-exit-codes optionScott Taylor committed 1 year agofa7d9c0
  21. cli: migrate remainder of Config::get() to StackedConfig::get()Yuya Nishihara committed 1 year ago4134511
  22. cli: leverage new settings.get(path) in merge-tools lookupYuya Nishihara committed 1 year ago94c6d6e
  23. settings: migrate get() to StackedConfig, rename .stacked_config to .configYuya Nishihara committed 1 year ago3890e42
  24. settings: forward .get_table(key) to underlying config objectYuya Nishihara committed 1 year ago5946ef3
  25. settings: own StackedConfig by UserSettings, migrate tests to use config layerYuya Nishihara committed 1 year agoda01734
  26. merge_tools: allow setting conflict marker style per-toolScott Taylor committed 1 year ago7f57866
  27. conflicts: add "ui.conflict-marker-style" configScott Taylor committed 1 year agoe5cb9f9
  28. settings: add forwarding getters, replace most of .config() usesYuya Nishihara committed 1 year agofc57139
  29. config: add type alias for config::ConfigErrorYuya Nishihara committed 1 year ago6d26d53
  30. conflicts: extract materialize_merge_result_to_bytes() helperYuya Nishihara committed 2 years ago59a79fd
  31. repo_path: add stub for checked to_fs_path(), rename unchecked functionsYuya Nishihara committed 2 years ago739bf8d
  32. object_id: implement Display on ObjectId typesYuya Nishihara committed 2 years agoad4b940
  33. diff: return matching hunk contents from all inputsYuya Nishihara committed 2 years ago383cca4
  34. style: add semicolon at the end of expressions used as statementsSamuel Tardieu committed 2 years ago3f2ef2e
  35. style: remove useless uses of `.iter()`Samuel Tardieu committed 2 years ago62f582e