diff --git a/git/config b/git/config
index 000ff62..f00d966 100644
--- a/git/config
+++ b/git/config
@@ -78,7 +78,7 @@
 	fsckobjects = true
 
 [merge]
-	conflictstyle = diff3
+	conflictstyle = zdiff3
 
 [diff]
 	algorithm = histogram