3 ms·
By merge you mean replace, right? Because at this point the trees have diverged enough to make a merge a nightmare.
by Touche 12y ago
By merge you mean replace, right? Because at this point the trees have diverged enough to make a merge a nightmare.
- leorocky 12y agoThough they are backporting vim patches all the time. Some of those patches must be hard to backport into neovim given the divergence.
- davis 12y agoThe 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/24c22daf94f8f38f83973c8c01a10d74c08feffe https://github.com/oni-link/neovim/commit/24c22daf94f8f38f83... - https://github.com/oni-link/neovim/commit/80c6f97da6e5c49f35680e3988a6fcef67caa1ff https://github.com/oni-link/neovim/commit/80c6f97da6e5c49f35... - https://github.com/oni-link/neovim/commit/b069ad535cfce8f1aa0665cfcd5da21346d2aa51 https://github.com/oni-link/neovim/commit/b069ad535cfce8f1aa...