From 9c8f40e3562be6d8a32d54594028d4e2cbba8e4c Mon Sep 17 00:00:00 2001 From: Dan Davison Date: Tue, 22 Oct 2024 09:21:26 +0100 Subject: [PATCH] Don't set colorMoved in introductory instructions (#1884) Fixes #1098 --- README.md | 3 --- manual/src/get-started.md | 10 +++++----- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 084a9481c..17aacf693 100644 --- a/README.md +++ b/README.md @@ -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/). diff --git a/manual/src/get-started.md b/manual/src/get-started.md index fdbaf2e43..2153b0db0 100644 --- a/manual/src/get-started.md +++ b/manual/src/get-started.md @@ -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 - ```