diff --git a/git/gitconfig b/git/gitconfig
index 71b652b..76729f2 100644
--- a/git/gitconfig
+++ b/git/gitconfig
@@ -9,6 +9,7 @@
 [merge]
 	defaultToUpstream = true
 	tool = vimdiff
+	conflictstyle = diff3
 [core]
 	editor = vim
 	eol = native