From: Simon Ruderich <simon@ruderich.org>
Date: Mon, 15 Jul 2024 06:27:29 +0000 (+0200)
Subject: vcs: gitconfig: improve merge conflict markers
X-Git-Url: https://ruderich.org/simon/gitweb/?a=commitdiff_plain;h=72ca0e4c99d7a6d017ab9fca92d3989168f32d18;p=config%2Fdotfiles.git

vcs: gitconfig: improve merge conflict markers
---

diff --git a/vcs/gitconfig.in b/vcs/gitconfig.in
index 28b9bf0..9fe449d 100644
--- 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.