hgext/rebase.py
changeset 39133 06baaf43c959
parent 39116 ffb34ee6de9e
child 39135 485a3349d5ee
--- 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)