From: Hendrik Jäger <gitcommit@henk.geekmail.org>
Date: Mon, 30 Jan 2023 15:15:23 +0000 (+0100)
Subject: feat: show common ancestor in merge conflicts
X-Git-Url: https://git.netwichtig.de/gitweb/?a=commitdiff_plain;ds=sidebyside;h=d9b6b2542410d7f21bcd59f1a69be1f6cc8a5e68;p=user%2Fhenk%2Fvcsh%2Fgit.git

feat: show common ancestor in merge conflicts
---

diff --git a/.config/git/config b/.config/git/config
index 66163dd..06f7209 100644
--- a/.config/git/config
+++ b/.config/git/config
@@ -46,6 +46,8 @@
 [merge]
   # use vimdiff as mergetool
   tool = vimdiff
+  # this shows the ancestor
+  conflictstyle = diff3
 [pretty]
   compact = %C(auto)%h%Cgreen% cs%Cblue%<(15,trunc)% an%C(auto)%d%Creset% s
 [push]