From 686f19ae49e26e972ea2cc761b84ee5f99cab872 Mon Sep 17 00:00:00 2001 From: Justin Su Date: Sun, 13 Jul 2025 08:24:37 -0400 Subject: Normalize `merge.conflictStyle` casing --- README.md | 2 +- manual/src/configuration.md | 2 +- manual/src/get-started.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) 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: diff --git a/manual/src/configuration.md b/manual/src/configuration.md index a71186c..4ae93a3 100644 --- a/manual/src/configuration.md +++ b/manual/src/configuration.md @@ -18,7 +18,7 @@ Delta uses [git config](https://git-scm.com/docs/git-config#_configuration_file) dark = true # or light = true, or omit for auto-detection [merge] - conflictstyle = zdiff3 + conflictStyle = zdiff3 ``` You do not even need to use git -- delta accepts `git diff` and unified diff formats and hence works with e.g. mercurial and jujutsu -- but you do need to use the git config format. diff --git a/manual/src/get-started.md b/manual/src/get-started.md index 50d07de..1666524 100644 --- a/manual/src/get-started.md +++ b/manual/src/get-started.md @@ -17,5 +17,5 @@ # light = true [merge] - conflictstyle = zdiff3 + conflictStyle = zdiff3 ``` -- cgit v1.2.3