From 633a4452a7833cabb7ae50466d4deaec84522a3b Mon Sep 17 00:00:00 2001
From: Nishant Aanjaney Jalan <cybercoder.nishant@gmail.com>
Date: Wed, 2 Apr 2025 14:32:17 +0100
Subject: [PATCH] fix README typo to conflictStyle

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

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: