diff --git a/git/gitconfig b/git/gitconfig
index e476973..32cb5b2 100644
--- a/git/gitconfig
+++ b/git/gitconfig
@@ -72,6 +72,10 @@
 
 [merge]
   tool = vimdiff
+  conflictstyle = diff3
+
+[mergetool]
+  prompt = false
 
 [http]
   sslverify = false