# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 1579910454 28800
# Node ID 2b6632d64328a4cd1e28fa2eefb0b0a53b9e74c6
# Parent  75c2ca094d3a6d9827d9ac19811396fdb2b73370
merge: check that there are no conflicts after --abort

Same idea as in abcc82bf0717 (clean: check that there are no conflicts
after, 2020-01-24). We should reuse more code here, but that will come
later.

Differential Revision: https://phab.mercurial-scm.org/D7994

diff -r 75c2ca094d3a -r 2b6632d64328 mercurial/hg.py
--- a/mercurial/hg.py	Fri Jan 24 15:07:44 2020 -0800
+++ b/mercurial/hg.py	Fri Jan 24 16:00:54 2020 -0800
@@ -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(