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

cli: move merge-tools name to [table] header

Browse source 
Even though we need to repeat "merge-tools", I feel it's a bit better to
group parameters by tool name. Tools are sorted by name.
This commit is contained in:
Yuya Nishihara 2022-12-15 14:03:38 +09:00
parent c86f7f87e4
commit 52e26a8d9a
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/merge-tools.toml
View file

@ -1,11 +1,11 @@
[merge-tools]
meld.merge-args = ["$left", "$base", "$right",
"-o", "$output", "--auto-merge"]
kdiff3.merge-args = ["$base", "$left", "$right",
"-o", "$output", "--auto"]
vimdiff.program = "vim"
vimdiff.merge-args = ["-f", "-d", "$output", "-M",
"$left", "$base", "$right",
"-c", "wincmd J", "-c", "set modifiable",
"-c", "set write"]
vimdiff.merge-tool-edits-conflict-markers=true
[merge-tools.kdiff3]
merge-args = ["$base", "$left", "$right", "-o", "$output", "--auto"]
[merge-tools.meld]
merge-args = ["$left", "$base", "$right", "-o", "$output", "--auto-merge"]
[merge-tools.vimdiff]
program = "vim"
merge-args = ["-f", "-d", "$output", "-M", "$left", "$base", "$right",
"-c", "wincmd J", "-c", "set modifiable", "-c", "set write"]
merge-tool-edits-conflict-markers = true