Closed ZyX-I closed 9 years ago
Well, that's just odd. I'd love to commit this. Your changes, as always, are immaculate.
Unfortunately, Github insists that "We can’t automatically merge this pull request." Since all of your changes appear to cleanly apply, I'm a little stumped as to what's going on. I'd prefer to resolve this today, so I think I'm going to attempt to merge your pull request manually at the CLI.
It is done.
Of course, I have no idea why your changes failed to apply. It probably had something to do with the order of commits 6d7fa96 and 77723df. (git
gets a bit grumpy when things get renamed, I've noticed.)
In any case: no harm, no foul. After manually merging the shambling monster back together, both git
and Github seem to be happy again. Which means I'm happy again. Which is good.
Required for NeoVim (neovim/neovim#2076).