diff --git a/.gitconfig_includes.cygwin b/.gitconfig_includes.cygwin
index fa9aea9e..1c1bbb3b 100644
--- a/.gitconfig_includes.cygwin
+++ b/.gitconfig_includes.cygwin
@@ -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