diff options
| author | Justin Su <injustsu@gmail.com> | 2025-07-13 08:24:37 -0400 |
|---|---|---|
| committer | Thomas Otto <th1000s@posteo.net> | 2025-08-03 17:41:01 +0200 |
| commit | 686f19ae49e26e972ea2cc761b84ee5f99cab872 (patch) | |
| tree | 2d2b0e92ec03d7e93ce5d180d3146c2f2d447ec1 | |
| parent | 923fc4d9e6fc62e91562256f27dec9b55da91a99 (diff) | |
Normalize `merge.conflictStyle` casing
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | manual/src/configuration.md | 2 | ||||
| -rw-r--r-- | manual/src/get-started.md | 2 |
3 files changed, 3 insertions, 3 deletions
@@ -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 ``` |