chiark / gitweb /
~mdw / profile / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 936b727)
dot/gitconfig.in: Get `git merge' to include ancestor text in conflicts.
authorMark Wooding <mdw@distorted.org.uk>
Tue, 4 Jul 2017 12:58:45 +0000 (13:58 +0100)
committerMark Wooding <mdw@distorted.org.uk>
Tue, 4 Jul 2017 23:40:37 +0000 (00:40 +0100)
dot/gitconfig.in patch | blob | blame | history

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
 [merge]
        summary = true
        tool = emerge
+       conflictStyle = diff3
 
 [mergetool "emerge"]
        path = emerge-hack
 
 [mergetool "emerge"]
        path = emerge-hack
Dotfiles and other configuration.