Skip to content

Commit

Permalink
Don't set colorMoved in introductory instructions (#1884)
Browse files Browse the repository at this point in the history
Fixes #1098
  • Loading branch information
dandavison authored Oct 22, 2024
1 parent 7690afa commit 9c8f40e
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 8 deletions.
3 changes: 0 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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/).
Expand Down
10 changes: 5 additions & 5 deletions manual/src/get-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

```

0 comments on commit 9c8f40e

Please sign in to comment.