Update docs to make 3 basic configs match (#2117)

This commit is contained in:
Justin Su
2026-03-09 06:57:22 -04:00
committed by GitHub
parent 92ecf506e2
commit a5b8c1b57e
2 changed files with 3 additions and 5 deletions
+1
View File
@@ -38,6 +38,7 @@ Or run:
git config --global core.pager delta
git config --global interactive.diffFilter 'delta --color-only'
git config --global delta.navigate true
git config --global delta.dark true # or `delta.light true`, or omit for auto-detection
git config --global merge.conflictStyle zdiff3
```
+2 -5
View File
@@ -10,11 +10,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