Skip to content
Snippets Groups Projects
Commit 06baaf43 authored by Gregory Szorc's avatar Gregory Szorc
Browse files

rebase: call _dorebase() properly

This fixes a regression from e9e742bd0501 where we failed to pass
all necessary arguments to _dorebase().

Differential Revision: https://phab.mercurial-scm.org/D4302
parent 873f3a56
No related branches found
No related tags found
No related merge requests found
......@@ -864,7 +864,7 @@
except error.InMemoryMergeConflictsError:
ui.warn(_('hit merge conflicts; re-running rebase without in-memory'
' merge\n'))
_dorebase(ui, repo, action='abort')
_dorebase(ui, repo, 'abort', opts)
return _dorebase(ui, repo, action, opts, inmemory=False)
else:
return _dorebase(ui, repo, action, opts)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment