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 /README.md | |
| parent | 923fc4d9e6fc62e91562256f27dec9b55da91a99 (diff) | |
Normalize `merge.conflictStyle` casing
Diffstat (limited to 'README.md')
| -rw-r--r-- | README.md | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -29,7 +29,7 @@ dark = true # or light = true, or omit for auto-detection [merge] - conflictstyle = zdiff3 + conflictStyle = zdiff3 ``` Or run: |