default git mergetool for cygwin changed to vimdiff
This commit is contained in:
parent
0f624b5893
commit
48dd215550
1 changed files with 1 additions and 1 deletions
|
@ -10,7 +10,7 @@
|
|||
trustExitCode = false
|
||||
keepBackup = false
|
||||
[merge]
|
||||
tool = kdiff3
|
||||
tool = vimdiff
|
||||
|
||||
[core]
|
||||
autocrlf = false
|
||||
|
|
Loading…
Reference in a new issue