From 3cc66ee0db4e96d70acdbf61dc45337339d82ed6 Mon Sep 17 00:00:00 2001
From: Daniil Tsivinsky <daniil@tsivinsky.com>
Date: Wed, 9 Mar 2022 11:11:09 +0300
Subject: [PATCH] update git mergetool cmd

---
 config/.gitconfig | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/config/.gitconfig b/config/.gitconfig
index 87b715d..4e539e7 100644
--- a/config/.gitconfig
+++ b/config/.gitconfig
@@ -7,11 +7,12 @@
   defaultBranch = master
 [push]
   followTags = true
-[mergetool "nvim"]
-  cmd = nvim -f -c \"Gdiffsplit!\" \"$MERGED\"
 [merge]
   tool = nvim
 [mergetool]
   prompt = false
+  keepBackup = false
+[mergetool "nvim"]
+  cmd = nvim -d $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
 [pull]
   rebase = false