From 4075a08aec74840e80eb85bca1259ff1a598f56e Mon Sep 17 00:00:00 2001
From: Gaetan Semet <gaetan@xeberon.net>
Date: Wed, 22 Oct 2014 13:47:41 +0200
Subject: [PATCH] don't set merge tool in gitconfig

Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
---
 dot_files/gitconfig | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/dot_files/gitconfig b/dot_files/gitconfig
index 8b32a0761..3de0f18f6 100644
--- a/dot_files/gitconfig
+++ b/dot_files/gitconfig
@@ -77,13 +77,8 @@ cmd = git mergetool --no-prompt
 [guitool "mergetool"]
   cmd = git mergetool --no-prompt
 
-[merge]
-    tool = kdiff3
-
-[mergetool "kdiff3"]
-  cmd = kdiff3
-  args = --L1 base --L2 mine --L3 theirs $base $local $other -o $output
-  keepBackup = false
+# [merge]
+#     tool = kdiff3
 
 [push]
   default = current