From 46a8f248fce66f26eceac70122ef1a6439caf576 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 2 Aug 2017 14:19:32 +0100
Subject: [PATCH] merge diff3

---
 templates/gitconfig.in | 2 ++
 1 file changed, 2 insertions(+)

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
-- 
2.30.2