[Ericson2314]

I think the former---from what I've heard neovim and vim are on very good relations, and here is the fruit of that.

[levemi]

Negative. NeoVim does away with supporting the ancient systems that are important to Bram for some reason. I seriously doubt they will merge.

[Ericson2314]

Good relations =/=> must plan to unfork, at least in a post-git world.