diff --git a/README.md b/README.md index 6feb4303d..83c0244e1 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ dark = true # or light = true, or omit for auto-detection [merge] - conflictstyle = zdiff3 + conflictStyle = zdiff3 ``` Or run: