D6588: abort: added support for merge

[pulkit (Pulkit Goyal)]

pulkit added inline comments.

INLINE COMMENTS

> test-commit-unresolved.t:48
> +#if abortflag
>    $ hg merge --abort
>    abort: no merge in progress

`hg abort` can be used. we can case the output here.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6588/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6588

To: taapas1128, #hg-reviewers
Cc: pulkit, mercurial-devel