git: use diff3 for conflictstyle

[dotfiles.git] / git / config

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]