dotfiles: ce7b3d1

1 files changed, 5 insertions(+), 0 deletions(-)

git: use vim as merge tool

Author: Oleksandr Smirnov olexsmir@gmail.com

Committed at: 2025-05-21 16:12:32 +0300

Parent: 671f34b

M gitconfig

@@ -34,6 +34,11 @@ diffFilter = delta --color-only
 
 [merge]
     conflictstyle = zdiff3
+    tool = nvim-diffview
+
+[merge "nvim-diffview"]
+  cmd = "nvim +DiffviewOpen"
+  prompt = false
 
 [rebase]
     autoSquash = true