search

mhinz / neovim-remote

:ok_hand: Support for --remote and friends.
MIT License
1.73k stars 83 forks source link

git mergetool issues #157

Open vito-c opened 4 years ago

vito-c commented 4 years ago

I recently updated to neovim 0.4.4 and I have nvr setup to be my merge tool.

When I open a new brand new terminal and run git mergetool it runs nvim and brings me to the start screen. I have to quit neovim and say the files weren't merged correctly then start neovim and :terminal then run git mergetool and then I have to hit enter 3 times as the 3 way diff opens up. Then I have to quit neovim and do the same open close process again for the next file.

My mergetool in my git config

[mergetool]
    keepBackup = false
    prompt = false
[mergetool "nvr"]
  #cmd = vimdiff --remote-wait-silent -d $BASE $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
  cmd = nvr -s -d $LOCAL $BASE $REMOTE $MERGED -c 'wincmd J | wincmd ='