vim: make vcs-jump "merge" mode work for Mercurial
vim: make vcs-jump "merge" mode work for Mercurial

Too many merge conflicts. I should have automated this sooner...

wincent/wincent,wincent/wincent,wincent/wincent,wincent/wincent,wincent/wincent,wincent/wincent,wincent/wincent,wincent/wincent