Submitter | phabricator |
---|---|
Date | Jan. 25, 2020, 12:17 a.m. |
Message ID | <differential-rev-PHID-DREV-3imwyxlgrqjtpj76ahha-req@mercurial-scm.org> |
Download | mbox | patch |
Permalink | /patch/44641/ |
State | Superseded |
Headers | show |
Comments
Patch
diff --git a/mercurial/hg.py b/mercurial/hg.py --- a/mercurial/hg.py +++ b/mercurial/hg.py @@ -1183,8 +1183,8 @@ repo.ui.status(_(b"aborting the merge, updating back to %s\n") % node[:12]) stats = mergemod.update(repo, node, branchmerge=False, force=True) + assert stats.unresolvedcount == 0 _showstats(repo, stats) - return stats.unresolvedcount > 0 def _incoming(