From ce7b3d1294255191d2a23eb8f62ebad99db159da Mon Sep 17 00:00:00 2001
From: Oleksandr Smirnov <olexsmir@gmail.com>
Date: Wed, 21 May 2025 16:12:32 +0300
Subject: [PATCH] git: use vim as merge tool

---
 gitconfig | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/gitconfig b/gitconfig
index de37bc5..4795673 100644
--- a/gitconfig
+++ b/gitconfig
@@ -34,6 +34,11 @@
 
 [merge]
     conflictstyle = zdiff3
+    tool = nvim-diffview
+
+[merge "nvim-diffview"]
+  cmd = "nvim +DiffviewOpen"
+  prompt = false
 
 [rebase]
     autoSquash = true