update git mergetool cmd

2022-03-09 11:11:09 +03:00
parent 003b7c79b2
commit 3cc66ee0db
1 changed files with 3 additions and 2 deletions
--- 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