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 954a76ad484406ab36a2dcecca283b43b4394158..0461dfd351206251ee08cba46e03232b1eb6b07a 100644 (file)
--- a/git/config
+++ b/git/config
@@ -24,6 +24,7 @@
 [merge]
        tool = fugitive
        defaultToUpstream = true
+       conflictstyle = diff3
 [mergetool]
        prompt = no
 [rebase]