forked from mirrors/jj
cli: add kdiff3 edit-args to stock config
This commit is contained in:
parent
52e26a8d9a
commit
62a38d3e86
1 changed files with 2 additions and 0 deletions
|
@ -1,4 +1,6 @@
|
||||||
[merge-tools.kdiff3]
|
[merge-tools.kdiff3]
|
||||||
|
# --merge to open output pane, CreateBakFiles=0 to not include backup files in commit
|
||||||
|
edit-args = ["--merge", "--cs", "CreateBakFiles=0"]
|
||||||
merge-args = ["$base", "$left", "$right", "-o", "$output", "--auto"]
|
merge-args = ["$base", "$left", "$right", "-o", "$output", "--auto"]
|
||||||
|
|
||||||
[merge-tools.meld]
|
[merge-tools.meld]
|
||||||
|
|
Loading…
Reference in a new issue