--- a/hgext/rebase.py	Mon Feb 05 13:10:33 2018 +0530
+++ b/hgext/rebase.py	Mon Feb 05 13:12:01 2018 +0530
@@ -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,