diff -r 8890fce7c13d -r 1b5cec8b6a1e hgext/rebase.py --- a/hgext/rebase.py Fri Apr 12 11:41:33 2019 -0400 +++ b/hgext/rebase.py Fri Apr 12 12:06:13 2019 -0400 @@ -949,6 +949,9 @@ except error.InMemoryMergeConflictsError: ui.status(_('hit a merge conflict\n')) return 1 + except error.Abort: + needsabort = False + raise else: if confirm: ui.status(_('rebase completed successfully\n'))