diff options
| -rw-r--r-- | README.md | 7 | ||||
| -rw-r--r-- | manual/src/configuration.md | 12 |
2 files changed, 5 insertions, 14 deletions
@@ -25,11 +25,8 @@ diffFilter = delta --color-only [delta] - navigate = true # use n and N to move between diff sections - - # delta detects terminal colors automatically; set one of these to disable auto-detection - # dark = true - # light = true + navigate = true # use n and N to move between diff sections + dark = true # or light = true, or omit for auto-detection [merge] conflictstyle = zdiff3 diff --git a/manual/src/configuration.md b/manual/src/configuration.md index 5d0c689..9508ffd 100644 --- a/manual/src/configuration.md +++ b/manual/src/configuration.md @@ -14,17 +14,11 @@ The most convenient way to configure delta is with a `[delta]` section in `~/.gi diffFilter = delta --color-only [delta] - navigate = true # use n and N to move between diff sections - - # delta detects terminal colors automatically; set one of these to disable auto-detection - # dark = true - # light = true + navigate = true # use n and N to move between diff sections + dark = true # or light = true, or omit for auto-detection [merge] - conflictstyle = diff3 - -[diff] - colorMoved = default + conflictstyle = zdiff3 ``` </sub> |