From 686f19ae49e26e972ea2cc761b84ee5f99cab872 Mon Sep 17 00:00:00 2001
From: Justin Su <injustsu@gmail.com>
Date: Sun, 13 Jul 2025 08:24:37 -0400
Subject: Normalize `merge.conflictStyle` casing

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'README.md')

diff --git a/README.md b/README.md
index 6feb430..83c0244 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:
-- 
cgit v1.2.3