ok/jj
1
0
Fork 0
forked from mirrors/jj
jj/cli
Yuya Nishihara 529acb3d16 merge_tools: process "ui.diff-instructions" option by caller
This gets rid of the last UserSettings dependency from edit_diff_external().
I'm going to remove it from edit_diff() too, and let callers pass a
preconfigured MergeTool struct instead.

These changes will make it easier to add --tool=<name> argument #2575.
2024-03-02 10:31:27 +09:00
..
examples commit_templater: support extensions of the template language 2024-03-01 10:42:51 -05:00
src merge_tools: process "ui.diff-instructions" option by caller 2024-03-02 10:31:27 +09:00
testing revset: ad-hoc optimization for range queries containing unwanted wanted heads 2024-02-22 23:26:29 +09:00
tests merge_tools: process "ui.diff-instructions" option by caller 2024-03-02 10:31:27 +09:00
build.rs
Cargo.toml templater: add similarity hint to no such method/keyword errors 2024-02-28 09:03:04 +09:00
LICENSE