vcs: gitconfig: improve merge conflict markers

diff --git a/vcs/gitconfig.in b/vcs/gitconfig.in
index 28b9bf0990bfbbf19811fff62f370a77cc28d969..9fe449d46fab2d5cd22668cf6cb5ce0798beebf4 100644 (file)
--- a/vcs/gitconfig.in
+++ b/vcs/gitconfig.in
@@ -229,6 +229,9 @@
 
        # Merge upstream branch if `git merge` is called without arguments.
        defaultToUpstream = true
+       # Show original version in merge conflicts. zdiff3 (compared to diff3)
+       # moves common parts out of the conflict markers.
+       conflictStyle = zdiff3
 
 [pager]
        # Use pager for the following commands.