pulkit added a comment.
Also, can you add an entry about this to relnotes/next?
INLINE COMMENTS
> commands.py:4020
> + state = cmdutil.getunfinishedstate(repo)
> + if state._opname != 'merge':
> + raise error.Abort(_('cannot abort merge with %s in progress') %
state can be `None` here.
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
_______________________________________________
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
