From 22259907f21deb7207ee2066bafeb31c9c36a783 Mon Sep 17 00:00:00 2001
From: Dan Davison <dandavison7@gmail.com>
Date: Mon, 14 Oct 2024 13:30:27 -0400
Subject: [PATCH] Use same example config in manual as README

Fixes #1878
---
 manual/src/configuration.md | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/manual/src/configuration.md b/manual/src/configuration.md
index 43fabe664..5d0c689c4 100644
--- a/manual/src/configuration.md
+++ b/manual/src/configuration.md
@@ -11,22 +11,20 @@ The most convenient way to configure delta is with a `[delta]` section in `~/.gi
     pager = delta
 
 [interactive]
-    diffFilter = delta --color-only --features=interactive
+    diffFilter = delta --color-only
 
 [delta]
-    features = decorations
-
-[delta "interactive"]
-    keep-plus-minus-markers = false
-
-[delta "decorations"]
-    commit-decoration-style = blue ol
-    commit-style = raw
-    file-style = omit
-    hunk-header-decoration-style = blue box
-    hunk-header-file-style = red
-    hunk-header-line-number-style = "#067a00"
-    hunk-header-style = file line-number syntax
+    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
 ```
 
 </sub>