D6588: abort: added support for merge

[pulkit (Pulkit Goyal)]

This revision is now accepted and ready to land.
pulkit added inline comments.
pulkit accepted this revision.

INLINE COMMENTS

> pulkit wrote in hg.py:987
> Here the user is already running `hg merge --abort`, so we should not show this message.
> 
> Ideally, this `if` condition should not never when aborting a merge.

Turns out I am blind and the previous version already had everything correct. I will either apply previous version of fix things in flight.

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, pulkit
Cc: pulkit, mercurial-devel