From: Samir Benmendil <me@rmz.io>
Date: Sat, 1 May 2021 13:49:48 +0000 (+0100)
Subject: git: use diff3 for conflictstyle
X-Git-Url: https://git.rmz.io/dotfiles.git/commitdiff_plain/11a0c9f9676ea9f8f0e8768b3e6cc569786320c4?ds=inline

git: use diff3 for conflictstyle

Provides extra info on the conflicted file, instead of showing just the
new and the old, it also provides the base. This should help with
deciding which side to pick or better integrate both sides of the
conflict.
---

diff --git a/git/config b/git/config
index 954a76a..0461dfd 100644
--- a/git/config
+++ b/git/config
@@ -24,6 +24,7 @@
 [merge]
 	tool = fugitive
 	defaultToUpstream = true
+	conflictstyle = diff3
 [mergetool]
 	prompt = no
 [rebase]