equal
deleted
inserted
replaced
1171 else: |
1171 else: |
1172 # there were no conficts, mergestate was not stored |
1172 # there were no conficts, mergestate was not stored |
1173 node = repo[b'.'].hex() |
1173 node = repo[b'.'].hex() |
1174 |
1174 |
1175 repo.ui.status(_(b"aborting the merge, updating back to %s\n") % node[:12]) |
1175 repo.ui.status(_(b"aborting the merge, updating back to %s\n") % node[:12]) |
1176 stats = mergemod.update(repo, node, branchmerge=False, force=True) |
1176 stats = mergemod.clean_update(repo[node]) |
1177 assert stats.unresolvedcount == 0 |
1177 assert stats.unresolvedcount == 0 |
1178 _showstats(repo, stats) |
1178 _showstats(repo, stats) |
1179 |
1179 |
1180 |
1180 |
1181 def _incoming( |
1181 def _incoming( |