dotfiles: 6868e9d

1 files changed, 7 insertions(+), 1 deletions(-)

git: fix delta, this stuff anit optional

Author: Smirnov Oleksandr ss2316544@gmail.com

Committed at: 2024-04-09 13:57:02 +0300

Parent: 02e8b70

M gitconfig

@@ -25,7 +25,13 @@ cm = commit -m
     sw = switch
 
 [interactive]
-    diffFilter = delta
+    diffFilter = delta --color-only
+
+[merge]
+    conflictstyle = diff3
+
+[diff]
+    colorMoved = default
 
 [delta]
     features = tokyonight