equal
deleted
inserted
replaced
947 _origrebase(ui, repo, action, opts, rbsrt, inmemory=True, |
947 _origrebase(ui, repo, action, opts, rbsrt, inmemory=True, |
948 leaveunfinished=True) |
948 leaveunfinished=True) |
949 except error.InMemoryMergeConflictsError: |
949 except error.InMemoryMergeConflictsError: |
950 ui.status(_('hit a merge conflict\n')) |
950 ui.status(_('hit a merge conflict\n')) |
951 return 1 |
951 return 1 |
|
952 except error.Abort: |
|
953 needsabort = False |
|
954 raise |
952 else: |
955 else: |
953 if confirm: |
956 if confirm: |
954 ui.status(_('rebase completed successfully\n')) |
957 ui.status(_('rebase completed successfully\n')) |
955 if not ui.promptchoice(_(b'apply changes (yn)?' |
958 if not ui.promptchoice(_(b'apply changes (yn)?' |
956 b'$$ &Yes $$ &No')): |
959 b'$$ &Yes $$ &No')): |