From 52887a61af449802e791e1613e85726dd6825753 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Tue, 5 Jan 2010 14:49:38 -0500
Subject: [PATCH] use diff3 for conflicts

---
 .gitconfig | 2 ++
 1 file changed, 2 insertions(+)

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
-- 
2.39.5