From 415faed70ed95dd0368a9656a7e48d18a0250001 Mon Sep 17 00:00:00 2001
From: Cyryl Plotnicki-Chudyk <cyplo@cyplo.net>
Date: Fri, 16 Jan 2015 18:36:55 +0100
Subject: [PATCH] kdiff3 as a default merge and diff tool on all platforms now

---
 .gitconfig_includes.common | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/.gitconfig_includes.common b/.gitconfig_includes.common
index 7d32b953..295ec988 100644
--- 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