19 lines
485 B
Plaintext
19 lines
485 B
Plaintext
[core]
|
|
autocrlf = true
|
|
[diff]
|
|
tool = kdiff3
|
|
guitool = kdiff3
|
|
[difftool]
|
|
prompt = false
|
|
[difftool "kdiff3"]
|
|
path = C:/Program Files/KDiff3/kdiff3.exe
|
|
cmd = \"C:/Program Files/KDiff3/kdiff3.exe\" \"$LOCAL\" \"$REMOTE\"
|
|
[merge]
|
|
tool = kdiff3
|
|
[mergetool]
|
|
keepBackup = false
|
|
prompt = false
|
|
[mergetool "kdiff3"]
|
|
path = C:/Program Files/KDiff3/kdiff3.exe
|
|
cmd = \"C:/Program Files/KDiff3/kdiff3.exe\" \"$BASE\" \"$LOCAL\" \"$REMOTE\" -o \"$MERGED\"
|