From d9b6b2542410d7f21bcd59f1a69be1f6cc8a5e68 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Hendrik=20J=C3=A4ger?= Date: Mon, 30 Jan 2023 16:15:23 +0100 Subject: [PATCH] feat: show common ancestor in merge conflicts --- .config/git/config | 2 ++ 1 file changed, 2 insertions(+) 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] -- 2.39.2