changeset 39135 | 485a3349d5ee |
parent 39133 | 06baaf43c959 |
child 39328 | 94a4980695f8 |
--- a/hgext/rebase.py Fri Aug 17 10:19:17 2018 +0900 +++ b/hgext/rebase.py Fri Aug 17 10:21:25 2018 +0900 @@ -864,7 +864,7 @@ except error.InMemoryMergeConflictsError: ui.warn(_('hit merge conflicts; re-running rebase without in-memory' ' merge\n')) - _dorebase(ui, repo, 'abort', opts) + _dorebase(ui, repo, action='abort', opts={}) return _dorebase(ui, repo, action, opts, inmemory=False) else: return _dorebase(ui, repo, action, opts)