D6607: merge: disallow merge abort in case of an unfinished operation(issue6160)

[taapas1128 (Taapas Agrawal)]

taapas1128 added a comment.
taapas1128 marked an inline comment as done.


  added the entry in relnotes.

INLINE COMMENTS

> pulkit wrote in commands.py:4020
> state can be `None` here.

My bad I really shouldn't have missed that.

REPOSITORY
  rHG Mercurial

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

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

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