# HG changeset patch
# User Gregory Szorc <gregory.szorc@gmail.com>
# Date 1534445631 0
# Node ID 06baaf43c9599534ffe3b6ecd3275e68abe68c34
# Parent  873f3a56993ff077cdd95c98da37e2c740674538
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

diff -r 873f3a56993f -r 06baaf43c959 hgext/rebase.py
--- a/hgext/rebase.py	Thu Aug 16 16:59:40 2018 +0300
+++ b/hgext/rebase.py	Thu Aug 16 18:53:51 2018 +0000
@@ -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)