merge: call hg.abortmerge() directly and return early...
merge: call hg.abortmerge() directly and return early
It's seem really weird to go through a lot of unrelated code before we
call `hg.merge(..., abort=True)` when we can just call
`hg.abortmerge()` and return early.
Differential Revision:
https://phab.mercurial-scm.org/D7995
