Submitter | phabricator |
---|---|
Date | Feb. 5, 2018, 2:27 p.m. |
Message ID | <fd088448887462fd3e7ba3c9366415e9@localhost.localdomain> |
Download | mbox | patch |
Permalink | /patch/27320/ |
State | Not Applicable |
Headers | show |
Comments
Patch
diff --git a/hgext/rebase.py b/hgext/rebase.py --- a/hgext/rebase.py +++ b/hgext/rebase.py @@ -499,7 +499,8 @@ if not self.collapsef: merging = p2 != nullrev editform = cmdutil.mergeeditform(merging, 'rebase') - editor = cmdutil.getcommiteditor(editform=editform, **opts) + editor = cmdutil.getcommiteditor(editform=editform, + **pycompat.strkwargs(opts)) if self.wctx.isinmemory(): newnode = concludememorynode(repo, rev, p1, p2, wctx=self.wctx,