diff --git a/hgext/rebase.py b/hgext/rebase.py --- a/hgext/rebase.py +++ b/hgext/rebase.py @@ -867,11 +867,6 @@ leaveunfinished=True) except error.InMemoryMergeConflictsError: ui.status(_('hit a merge conflict\n')) - if confirm: - # abort as in-memory merge doesn't support conflict - rbsrt._prepareabortorcontinue(isabort=True, backup=False, - suppwarns=True) - needsabort = False return 1 else: if confirm: