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

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