Mercurial > hg

diff hgext/rebase.py @ 39135:485a3349d5ee

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: do not pass in user option to rollback in-memory merge conflict Nothing passed before e9e742bd0501.
author Yuya Nishihara <yuya@tcha.org>
date Fri, 17 Aug 2018 10:21:25 +0900
parents 06baaf43c959
children 94a4980695f8
line wrap: on
line diff
--- 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)