From d17d96adeab2f828c8285ceb39de4d58aa3d423b Mon Sep 17 00:00:00 2001
From: Cyryl Plotnicki-Chudyk <cyplo@cyplo.net>
Date: Wed, 28 Jan 2015 22:37:05 +0100
Subject: [PATCH] vimdiff added as a default difftool

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

diff --git a/.gitconfig_includes.common b/.gitconfig_includes.common
index 295ec988..96ef78da 100644
--- a/.gitconfig_includes.common
+++ b/.gitconfig_includes.common
@@ -16,7 +16,7 @@
 
 
 [diff]
-    tool = kdiff3
+    tool = vimdiff
 [difftool]
     prompt = false
 [merge]