ok/jj
1
0
Fork 0
forked from mirrors/jj
Code Pull requests Activity

merge_tools.toml: add a comment to meld-3 definition

Browse source 
In https://github.com/martinvonz/jj/pull/2665#issuecomment-1837552283,
a user used `$base` instead of one of the `$output`s and nothing worked.
This seems like a natural mistake to make, the config is confusing.
This commit is contained in:
Ilya Grigoriev 2023-12-03 15:22:49 -08:00
parent 1cc271441f
commit 1fd421f42c
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
cli/src/config/merge_tools.toml
View file

@ -9,6 +9,7 @@ merge-args = ["$left", "$base", "$right", "-o", "$output", "--auto-merge"]
[merge-tools.meld-3]
program="meld"
# If using this as a template, note that `$output` is repeated twice below
edit-args = ["$left", "$output", "$right", "-o", "$output"]
[merge-tools.vimdiff]