From 28266990bfaaea35fb008234cc19e3f2ef2207c2 Mon Sep 17 00:00:00 2001
From: Bruno Carlin <bruno.carlin@waarp.org>
Date: Wed, 17 Jun 2020 19:58:20 +0200
Subject: [PATCH] use nvim as mergetool in git with 3 panes

---
 git/.gitconfig | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/git/.gitconfig b/git/.gitconfig
index 20dc705..10edde4 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -28,8 +28,12 @@
 	insteadOf = https://code.waarp.fr
 [core]
 	pager = delta --dark --theme 'Solarized (dark)'
+# define command which will be used when "nvim" is set as a merge tool
+[mergetool "nvim"]
+  cmd = nvim -d $LOCAL $MERGED $REMOTE -c 'wincmd l'
 [merge]
-	tool = vimdiff
+    #tool = vimdiff
+    tool = nvim
 	guitool = meld
 [pull]
 	rebase = false