@ -24,7 +24,7 @@
tool = nvim-merge
[mergetool "nvim-merge"]
cmd = nvim -d $BASE $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
cmd = nvim -d $LOCAL $BASE $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
keepBackup = false
[diff]