15 lines
403 B
Text
15 lines
403 B
Text
|
# vim: ft=gitconfig
|
||
|
|
[mergetool "Kaleidoscope"]
|
||
|
|
cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
|
||
|
|
trustexitcode = true
|
||
|
|
[merge]
|
||
|
|
tool = Kaleidoscope
|
||
|
|
[difftool "Kaleidoscope"]
|
||
|
|
cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
|
||
|
|
[difftool]
|
||
|
|
prompt = false
|
||
|
|
[mergetool]
|
||
|
|
prompt = false
|
||
|
|
[diff]
|
||
|
|
tool = Kaleidoscope
|