Show More
@@ -949,6 +949,9 b' def _dryrunrebase(ui, repo, action, opts' | |||
|
949 | 949 | except error.InMemoryMergeConflictsError: |
|
950 | 950 | ui.status(_('hit a merge conflict\n')) |
|
951 | 951 | return 1 |
|
952 | except error.Abort: | |
|
953 | needsabort = False | |
|
954 | raise | |
|
952 | 955 | else: |
|
953 | 956 | if confirm: |
|
954 | 957 | ui.status(_('rebase completed successfully\n')) |
General Comments 0
You need to be logged in to leave comments.
Login now