From 6868e9db516fabe0ab4a994859e23a893ef2adbd Mon Sep 17 00:00:00 2001 From: Smirnov Oleksandr Date: Tue, 9 Apr 2024 13:56:53 +0300 Subject: [PATCH] git: fix delta, this stuff anit optional --- gitconfig | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/gitconfig b/gitconfig index c456a29..7f7b996 100644 --- a/gitconfig +++ b/gitconfig @@ -25,7 +25,13 @@ sw = switch [interactive] - diffFilter = delta + diffFilter = delta --color-only + +[merge] + conflictstyle = diff3 + +[diff] + colorMoved = default [delta] features = tokyonight