From: Mark Wooding <mdw@distorted.org.uk>
Date: Tue, 4 Jul 2017 12:58:45 +0000 (+0100)
Subject: dot/gitconfig.in: Get `git merge' to include ancestor text in conflicts.
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/profile/commitdiff_plain/5ffa4795873e37c6b39cf83df82470c1a7119fa0

dot/gitconfig.in: Get `git merge' to include ancestor text in conflicts.
---

diff --git a/dot/gitconfig.in b/dot/gitconfig.in
index b682839..79ead41 100644
--- a/dot/gitconfig.in
+++ b/dot/gitconfig.in
@@ -18,6 +18,7 @@
 [merge]
 	summary = true
 	tool = emerge
+	conflictStyle = diff3
 
 [mergetool "emerge"]
 	path = emerge-hack