diff --git a/gitconfig b/gitconfig
index 3eb316a..5ede30b 100644
--- a/gitconfig
+++ b/gitconfig
@@ -8,6 +8,9 @@
     ui = auto
 [push]
     default = current
+[merge]
+    tool = vimdiff
+    conflictstyle = diff3
 [alias]
     # Basics
     st = status -s