From 089ad2dd938f9caabf21bfbf52179dcdf4a8c6f2 Mon Sep 17 00:00:00 2001
From: Ruben Beltran del Rio <ruben@unlimited.pizza>
Date: Thu, 21 Sep 2023 22:22:57 +0200
Subject: Use nvim for mergetool

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

(limited to 'gitconfig')

diff --git a/gitconfig b/gitconfig
index cc14fe3..f3cb18d 100644
--- a/gitconfig
+++ b/gitconfig
@@ -21,3 +21,10 @@
 	defaultBranch = main
 [diff]
   external = difft
+	tool = vimdiff
+[merge]
+  tool = nvim
+[mergetool]
+  keepBackup = false
+[mergetool "nvim"]
+  cmd = nvim -d $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
-- 
cgit