From c5fc5eb13352f18595198ed49aa8ef95f8795cb0 Mon Sep 17 00:00:00 2001
From: Cyryl Plotnicki-Chudyk <cyplo@cyplo.net>
Date: Fri, 15 Nov 2013 11:30:11 +0100
Subject: [PATCH] kdiff3 support on cygwin

---
 .gitconfig_includes.cygwin | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

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