From 80fce7dbaf076510923b14544b2be4d6b2e85218 Mon Sep 17 00:00:00 2001
From: Cyryl Plotnicki-Chudyk <cyplo@cyplo.net>
Date: Mon, 16 Mar 2015 13:21:16 +0100
Subject: [PATCH] vimdiff as a default difftool everywhere

---
 .gitconfig_includes.common |  7 +------
 .gitconfig_includes.cygwin | 17 +----------------
 2 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/.gitconfig_includes.common b/.gitconfig_includes.common
index 762a0c5f..4e72e709 100644
--- a/.gitconfig_includes.common
+++ b/.gitconfig_includes.common
@@ -14,16 +14,11 @@
     head = log HEAD -n1
 [core]
     autocrlf = false
-
-
 [diff]
-    tool = kdiff3
+    tool = vimdiff
 [difftool]
     prompt = false
 [merge]
     tool = kdiff3
 [mergetool]
 	keepBackup = false
-[mergetool "splice"]
-    cmd = "vim -f $BASE $LOCAL $REMOTE $MERGED -c 'SpliceInit'"
-    trustExitCode = true
diff --git a/.gitconfig_includes.cygwin b/.gitconfig_includes.cygwin
index 4ba4540b..23bed021 100644
--- a/.gitconfig_includes.cygwin
+++ b/.gitconfig_includes.cygwin
@@ -1,17 +1,2 @@
-[difftool "kdiff3"]
-    path = kdiff3.sh
-    trustExitCode = false
-[difftool]
-    prompt = false
-[diff]
-    tool = kdiff3
-[mergetool "kdiff3"]
-    path = kdiff3.sh
-    trustExitCode = false
-    keepBackup = false
-[merge]
-    tool = kdiff3
-
 [core]
-	autocrlf = false
-
+	autocrlf = true