diff --git a/dot_gitconfig.tmpl b/dot_gitconfig.tmpl
index 6cd52ea..b996e98 100644
--- a/dot_gitconfig.tmpl
+++ b/dot_gitconfig.tmpl
@@ -51,4 +51,4 @@
 [help]
 	autocorrect = 20
 [merge]
-	conflictstyle = diff3
+	conflictstyle = zdiff3