mirror of
https://github.com/dandavison/delta.git
synced 2024-11-23 09:14:43 +03:00
De-emphasize auto-detection of colors in README config
This commit is contained in:
parent
1a8d3bc994
commit
1fb6f99ec4
@ -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
|
||||
|
@ -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>
|
||||
|
Loading…
Reference in New Issue
Block a user