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
src	merge_tools: process "ui.diff-instructions" option by caller	2024-03-02 10:31:27 +09:00
testing
tests	merge_tools: process "ui.diff-instructions" option by caller	2024-03-02 10:31:27 +09:00
build.rs
Cargo.toml
LICENSE