X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=gitconfig;h=7f660898b1ac542bc81fef73d8c7f96add1257fd;hb=609886c6cadc4e00226f3ef27557d247eeffa93a;hp=f19f617758c50381e7b335d1fb2915f7ca47ce44;hpb=af422603f7ef3a8f4e16f122b0b56824ae42b57c;p=~madcoder%2Fdotfiles.git

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]