Commit d9c9b1c2 authored by Steve Borho's avatar Steve Borho
Browse files

merge: allow merge to complete even with one parent

Certain branch merges will not result in two parents, so only look at the
merge command return code to determine if it was successful.
parent d7e6cbd728dc
......@@ -370,8 +370,7 @@ class MergePage(BasePage):
def command_finished(self, ret):
repo = self.wizard().repo
repo.dirstate.invalidate()
if len(repo.parents()) == 2 and ret in (0, 1):
if ret in (0, 1):
repo.incrementBusyCount()
repo.decrementBusyCount()
self.done = True
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment