From: Mike Frysinger <vapier@gentoo.org>
Date: Tue, 5 Jan 2010 19:49:38 +0000 (-0500)
Subject: use diff3 for conflicts
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=52887a61af449802e791e1613e85726dd6825753;p=home.git

use diff3 for conflicts
---

diff --git a/.gitconfig b/.gitconfig
index f17feb8..fb128a2 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -35,6 +35,8 @@
 	se   = send-email
 	st   = status
 	t    = tag
+[merge]
+	conflictstyle = diff3
 [sendemail]
 	chainreplyto = false
 	suppressfrom = true