vimdiff as a default difftool everywhere

2015-03-16 13:21:16 +01:00 · 2015-03-16 13:21:16 +01:00 · 80fce7dbaf
parent bf44cdbd18
commit 80fce7dbaf
2 changed files with 2 additions and 22 deletions
--- 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
--- 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