diff --git a/.gitconfig_includes.cygwin b/.gitconfig_includes.cygwin
index d86e50cf..2b5136c3 100644
--- a/.gitconfig_includes.cygwin
+++ b/.gitconfig_includes.cygwin
@@ -10,7 +10,7 @@
     trustExitCode = false
     keepBackup = false
 [merge]
-    tool = kdiff3
+    tool = vimdiff
 
 [core]
 	autocrlf = false