kdiff3 support on cygwin

This commit is contained in:
Cyryl Plotnicki-Chudyk 2013-11-15 11:30:11 +01:00
parent fe82ed02df
commit c5fc5eb133

View file

@ -1,3 +1,14 @@
[http]
#sslCAinfo = /usr/ssl/certs/github.bundle.pem
[difftool "kdiff3"]
path = kdiff3
trustExitCode = false
[difftool]
prompt = false
[diff]
tool = kdiff3
[mergetool "kdiff3"]
path = kdiff3
trustExitCode = false
keepBackup = false
[merge]
tool = kdiff3