From 48dd21555022f0b107e7cd03df882698bef61332 Mon Sep 17 00:00:00 2001
From: Cyryl Plotnicki-Chudyk <cyplo@cyplo.net>
Date: Tue, 11 Feb 2014 13:47:27 +0100
Subject: [PATCH] default  git mergetool for cygwin changed to vimdiff

---
 .gitconfig_includes.cygwin | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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