From: Pierre Habouzit <madcoder@debian.org>
Date: Mon, 28 Dec 2009 18:26:38 +0000 (+0100)
Subject: Use diff3 conflicts.
X-Git-Url: http://git.madism.org/?a=commitdiff_plain;h=609886c6cadc4e00226f3ef27557d247eeffa93a;p=~madcoder%2Fdotfiles.git

Use diff3 conflicts.

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

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