diff --git a/dots/.gitconfig b/dots/.gitconfig
index 82ad4c45..5e77ada8 100644
--- a/dots/.gitconfig
+++ b/dots/.gitconfig
@@ -46,3 +46,5 @@
     unstage = reset HEAD --
 [push]
     autoSetupRemote = true
+[merge]
+    conflictstyle = diff3