--- a/.gitconfig	Sun Feb 22 23:22:23 2015 +0200
+++ b/.gitconfig	Sun Feb 22 23:32:48 2015 +0200
@@ -46,6 +46,9 @@
 # detection; equivalent to the git diff option -l.
 # renamelimit = 0
 
+[merge]
+conflictstyle = diff3
+
 [log]
 date = iso