Show More
@@ -1183,8 +1183,8 b' def abortmerge(ui, repo):' | |||||
1183 |
|
1183 | |||
1184 | repo.ui.status(_(b"aborting the merge, updating back to %s\n") % node[:12]) |
|
1184 | repo.ui.status(_(b"aborting the merge, updating back to %s\n") % node[:12]) | |
1185 | stats = mergemod.update(repo, node, branchmerge=False, force=True) |
|
1185 | stats = mergemod.update(repo, node, branchmerge=False, force=True) | |
|
1186 | assert stats.unresolvedcount == 0 | |||
1186 | _showstats(repo, stats) |
|
1187 | _showstats(repo, stats) | |
1187 | return stats.unresolvedcount > 0 |
|
|||
1188 |
|
1188 | |||
1189 |
|
1189 | |||
1190 | def _incoming( |
|
1190 | def _incoming( |
General Comments 0
You need to be logged in to leave comments.
Login now