summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHendrik Jäger <gitcommit@henk.geekmail.org>2023-01-30 16:15:23 +0100
committerHendrik Jäger <gitcommit@henk.geekmail.org>2023-01-30 16:15:23 +0100
commitd9b6b2542410d7f21bcd59f1a69be1f6cc8a5e68 (patch)
treeb5bb77ba92ba1fbb01a069a26f4473d06921ca2f
parentde425f63f94ae39fcdc00428b7cacf8607141432 (diff)
feat: show common ancestor in merge conflicts
-rw-r--r--.config/git/config2
1 files changed, 2 insertions, 0 deletions
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]