merge diff3

[ian-dotfiles.git] / templates / gitconfig.in

diff --git a/templates/gitconfig.in b/templates/gitconfig.in
index 6aacb67d6cbd24cf6777ea9b405ce2224f3156ed..fffd447bc41cb1e2596282d6fb5cdee64716d84f 100755 (executable)
--- a/templates/gitconfig.in
+++ b/templates/gitconfig.in
@@ -53,4 +53,6 @@ cat <<END
 [color]
        diff = false
        ui = false
+[merge]
+       conflictStyle = diff3
 END