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

cli: add kdiff3 edit-args to stock config

Browse source
This commit is contained in:
Yuya Nishihara 2022-12-15 14:10:37 +09:00
parent 52e26a8d9a
commit 62a38d3e86
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/merge-tools.toml
View file

@ -1,4 +1,6 @@
[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-tools.meld]