]> git.wh0rd.org - home.git/commitdiff
git.wh0rd.org / home.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d33ba63)
use diff3 for conflicts
authorMike Frysinger <vapier@gentoo.org>
Tue, 5 Jan 2010 19:49:38 +0000 (14:49 -0500)
committerMike Frysinger <vapier@gentoo.org>
Sat, 28 Apr 2012 19:36:34 +0000 (15:36 -0400)
.gitconfig patch | blob | blame | history

diff --git a/.gitconfig b/.gitconfig
index f17feb867157c8d0c8447217909d1e62032ad817..fb128a2092a8bd50b809b57221a2c6b12a8e8270 100644 (file)
--- a/.gitconfig
+++ b/.gitconfig
@@ -35,6 +35,8 @@
        se   = send-email
        st   = status
        t    = tag
+[merge]
+       conflictstyle = diff3
 [sendemail]
        chainreplyto = false
        suppressfrom = true
my ~/