That's not possible. Read the original text on Bountysource [1], the whole idea behind the project was to make a clean break from Vim and implement changes that were ignored when were brought up on the Vim mailing list.

[1] https://www.bountysource.com/teams/neovim/fundraiser

By merge you mean replace, right? Because at this point the trees have diverged enough to make a merge a nightmare.

Though they are backporting vim patches all the time. Some of those patches must be hard to backport into neovim given the divergence.

The code is just being refactored so a lot of the code that needs to be patched still exists. The patches are all quite small as well; it just exists in different places.

Take a look at some of the patches to see:

- https://github.com/oni-link/neovim/commit/24c22daf94f8f38f83...

- https://github.com/oni-link/neovim/commit/80c6f97da6e5c49f35...

- https://github.com/oni-link/neovim/commit/b069ad535cfce8f1aa...