Use diff3 conflicts.

Signed-off-by: Pierre Habouzit <madcoder@debian.org>

diff --git a/gitconfig b/gitconfig
index f19f617..7f66089 100644 (file)
--- a/gitconfig
+++ b/gitconfig
@@ -52,6 +52,7 @@
     untracked = bold yellow
 [merge]
     verbosity = 1
+    conflictstyle = diff3
 [clean]
     requireForce = false
 [pack]