feat: show common ancestor in merge conflicts

diff --git a/.config/git/config b/.config/git/config
index 66163ddab251bdecdb216bfe379544ab55e8aef9..06f7209166613ab13b9335989011ee48cbefc392 100644 (file)
--- 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]