use diff3 for conflicts

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