forked from mirrors/jj
cli: move merge-tools name to [table] header
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:
parent
c86f7f87e4
commit
52e26a8d9a
1 changed files with 11 additions and 11 deletions
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue