mirror of
https://github.com/dandavison/delta.git
synced 2024-11-27 05:44:48 +03:00
parent
7690afa9e9
commit
9c8f40e356
@ -33,9 +33,6 @@
|
||||
|
||||
[merge]
|
||||
conflictstyle = diff3
|
||||
|
||||
[diff]
|
||||
colorMoved = default
|
||||
```
|
||||
|
||||
Delta has many features and is very customizable; please see the [user manual](https://dandavison.github.io/delta/).
|
||||
|
@ -10,12 +10,12 @@
|
||||
diffFilter = delta --color-only
|
||||
|
||||
[delta]
|
||||
navigate = true
|
||||
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
|
||||
|
||||
[merge]
|
||||
conflictstyle = diff3
|
||||
|
||||
[diff]
|
||||
colorMoved = default
|
||||
|
||||
```
|
||||
|
Loading…
Reference in New Issue
Block a user