From 2a187872381ab24dcfaae024da872854a0a3f73d Mon Sep 17 00:00:00 2001 From: Andrei Astafev Date: Wed, 26 Apr 2023 17:18:48 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A4=D0=BE=D1=80=D0=BC=D0=B0=D1=82=D0=B8?= =?UTF-8?q?=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- user.conf.example | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/user.conf.example b/user.conf.example index 253a07d..357ee5a 100644 --- a/user.conf.example +++ b/user.conf.example @@ -1,22 +1,22 @@ [user] - name = John Doe - email = john@doe.com + name = John Doe + email = john@doe.com [core] - editor = mcedit - pager = delta + editor = mcedit + pager = delta [interactive] - diffFilter = delta --color-only + 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 + 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 = delta - conflictstyle = diff3 + tool = delta + conflictstyle = diff3 [diff] - colorMoved = default + colorMoved = default