diff --git a/dot_config/git/config b/dot_config/git/config
index bcd8700..8be12e8 100644
--- a/dot_config/git/config
+++ b/dot_config/git/config
@@ -37,3 +37,7 @@
     smtpserver = /usr/bin/msmtp
     smtpserveroption = -a
     smtpserveroption = tdj
+
+[merge]
+    tool = vimdiff
+    conflictstyle = diff3