kdiff3 as a default merge and diff tool on all platforms now

2015-01-16 18:36:55 +01:00 · 2015-01-16 18:36:55 +01:00 · 415faed70e
parent 17b5fab08d
commit 415faed70e
1 changed files with 10 additions and 0 deletions
--- a/.gitconfig_includes.common
+++ b/.gitconfig_includes.common
@ -11,5 +11,15 @@
 	pager = cat
 [alias]
    tree = log --show-signature --color --decorate --date=short --all --graph -n 9
+[core]
+    autocrlf = false
+
+
+[diff]
+    tool = kdiff3
+[difftool]
+    prompt = false
+[merge]
+    tool = kdiff3
 [mergetool]
 	keepBackup = false