How to avoid vim inside vim for git/mercurial merge?

user_2870012 0
Viewed 131

I use a terminal inside vim to run my commands. I have set vim as my merge tool (in git and mercurial).

During rebase, when there's a conflict that needs manual merging, the terminal opens a vim instance inside it for merging. With this, I have vim running inside vim. That often creates key binding conflicts between the host vim and the vim inside it.

Is there a way I can make the terminal use its host vim for conflict resolution (by opening a new tab or something) instead of creating a new vim instance inside itself ?

neovim vim git bash
1 Answers

For Neovim there is a plugin neovim-remote.

For vim compiled with +clientserver, you can start vim as a server and connect to it with --servername and --remote. Check this Reddit thread.

user_46759270
Related