From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 2 Aug 2017 13:19:32 +0000 (+0100)
Subject: merge diff3
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=ian-dotfiles.git;a=commitdiff_plain;h=46a8f248fce66f26eceac70122ef1a6439caf576;hp=1f8f61d559ee769be9f3eaadb896195f8fa6339b

merge diff3
---

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