diff --git a/dotfiles/gitconfig b/dotfiles/gitconfig
index e300459..9fea2fa 100644
--- a/dotfiles/gitconfig
+++ b/dotfiles/gitconfig
@@ -58,3 +58,8 @@
 	helper = cache --timeout=36000
 [receive]
 	denyCurrentBranch = updateInstead
+[merge]
+	tool = vimdiff
+	conflictstyle = diff3
+[mergetool]
+	prompt = false