D6588: abort: added support for merge

pulkit (Pulkit Goyal) phabricator at mercurial-scm.org
Wed Jul 10 16:46:11 EDT 2019


pulkit added inline comments.

INLINE COMMENTS

> hg.py:987
> +    if stats.unresolvedcount:
> +        repo.ui.status(_("use 'hg resolve' to retry unresolved file merges "
> +                         "or 'hg merge --abort' to abandon\n"))

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.

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


More information about the Mercurial-devel mailing list