2013-11-15 11:30:11 +01:00
|
|
|
[difftool "kdiff3"]
|
2013-11-27 10:10:17 +01:00
|
|
|
path = kdiff3.sh
|
2013-11-15 11:30:11 +01:00
|
|
|
trustExitCode = false
|
|
|
|
[difftool]
|
|
|
|
prompt = false
|
|
|
|
[diff]
|
|
|
|
tool = kdiff3
|
|
|
|
[mergetool "kdiff3"]
|
2015-01-28 22:37:39 +01:00
|
|
|
path = kdiff3.sh
|
2013-11-15 11:30:11 +01:00
|
|
|
trustExitCode = false
|
|
|
|
keepBackup = false
|
|
|
|
[merge]
|
2014-02-11 15:17:04 +01:00
|
|
|
tool = kdiff3
|
2013-10-25 13:44:43 +02:00
|
|
|
|
2013-11-18 11:26:50 +01:00
|
|
|
[core]
|
2013-11-27 18:52:31 +01:00
|
|
|
autocrlf = false
|
2013-11-26 10:46:32 +01:00
|
|
|
|