From 1970054228b3a9a3a8fc99af723ee13c147e7747 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <cynerd@email.cz>
Date: Sun, 25 Feb 2024 22:49:55 +0100
Subject: Migrate from vim to nvim

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

(limited to 'gitconfig')

diff --git a/gitconfig b/gitconfig
index 084228d..b6deec6 100644
--- a/gitconfig
+++ b/gitconfig
@@ -22,6 +22,8 @@
 	gpgSign = true
 [merge]
 	tool = vimdiff
+[mergetool "vimdiff"]
+  cmd = nvim -d $BASE $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
 [alias]
 	co = checkout
 	ci = commit
-- 
cgit v1.2.3