Commits

Graham Helliwell committed c3131e2

Update back to a clean state if the merge fails

  • Participants
  • Parent commits a415c43

Comments (0)

Files changed (1)

                               (repo.changelog.rev(secondparent), short(secondparent)))
                     # We want ui.merge internal:prompt
                     err = hg.merge(repo, secondparent, remind=False)
+                    if err:
+                        self.updateClean(firstparent)
+
 
                 if not err:
                     # we don't translate commit messages