kdiff3 support on cygwin
This commit is contained in:
parent
fe82ed02df
commit
c5fc5eb133
1 changed files with 13 additions and 2 deletions
|
@ -1,3 +1,14 @@
|
||||||
[http]
|
[difftool "kdiff3"]
|
||||||
#sslCAinfo = /usr/ssl/certs/github.bundle.pem
|
path = kdiff3
|
||||||
|
trustExitCode = false
|
||||||
|
[difftool]
|
||||||
|
prompt = false
|
||||||
|
[diff]
|
||||||
|
tool = kdiff3
|
||||||
|
[mergetool "kdiff3"]
|
||||||
|
path = kdiff3
|
||||||
|
trustExitCode = false
|
||||||
|
keepBackup = false
|
||||||
|
[merge]
|
||||||
|
tool = kdiff3
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue