1 files changed, 1 insertions, 1 deletions

diff --git a/README.md b/README.md
index 17aacf6..cfa3441 100644
--- a/README.md
+++ b/README.md
@@ -32,7 +32,7 @@
     # light = true
 
 [merge]
-    conflictstyle = diff3
+    conflictstyle = zdiff3
 ```
 
 Delta has many features and is very customizable; please see the [user manual](https://dandavison.github.io/delta/).