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