--- a/mercurial/cmdutil.py	Tue Jun 27 00:15:56 2017 +0530
+++ b/mercurial/cmdutil.py	Tue Jun 27 00:23:32 2017 +0530
@@ -2839,7 +2839,8 @@
                 user = opts.get('user') or old.user()
                 date = opts.get('date') or old.date()
             editform = mergeeditform(old, 'commit.amend')
-            editor = getcommiteditor(editform=editform, **opts)
+            editor = getcommiteditor(editform=editform,
+                                     **pycompat.strkwargs(opts))
             if not message:
                 editor = getcommiteditor(edit=True, editform=editform)
                 message = old.description()