From dcb3a561074861c8b2185edadb6aff0cb2c457cc Mon Sep 17 00:00:00 2001
From: Andrey Astafyev <dev@246060.ru>
Date: Mon, 19 Dec 2022 14:20:18 +0300
Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7?=
 =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20delta?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 user.conf.example | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/user.conf.example b/user.conf.example
index bc9ff3d..253a07d 100644
--- a/user.conf.example
+++ b/user.conf.example
@@ -4,8 +4,19 @@
 
 [core]
 	editor       = mcedit
-	pager        = less -R
+	pager        = delta
+
+[interactive]
+	diffFilter   = delta --color-only
+
+[delta]
+	navigate     = true    # use n and N to move between diff sections
+	light        = false      # set to true if you're in a terminal w/ a light background color
+	side-by-side = true
 
 [merge]
-	tool         = meld
+	tool          = delta
+	conflictstyle = diff3
 
+[diff]
+	colorMoved    = default