diff -r 11f3d4458e3a -r b7ccdb52e0f9 hgext/rebase.py --- a/hgext/rebase.py Sat Dec 26 18:04:30 2020 +0530 +++ b/hgext/rebase.py Sat Dec 26 18:26:32 2020 +0530 @@ -1139,13 +1139,16 @@ try: overrides = {(b'rebase', b'singletransaction'): True} with ui.configoverride(overrides, b'rebase'): - _origrebase( + res = _origrebase( ui, repo, action, opts, rbsrt, ) + if res == _nothingtorebase(): + needsabort = False + return res except error.ConflictResolutionRequired: ui.status(_(b'hit a merge conflict\n')) return 1