Commits

Steve Borho committed cff3195

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.

Comments (0)

Files changed (1)

tortoisehg/hgqt/merge.py

 
     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