X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/aec02e29c44ae438e42cac926290626061af1894..11a0c9f9676ea9f8f0e8768b3e6cc569786320c4:/git/config

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]