--- a/mercurial/commands.py	Sat Aug 16 10:19:26 2014 -0700
+++ b/mercurial/commands.py	Sat Aug 16 10:43:59 2014 +0900
@@ -1448,7 +1448,7 @@
                     # Propagate to subrepos
                     baseui.setconfig('phases', 'new-commit', 'secret', 'commit')
 
-                editform = 'commit.normal'
+                editform = cmdutil.mergeeditform(repo[None], 'commit.normal')
                 editor = cmdutil.getcommiteditor(editform=editform, **opts)
                 return repo.commit(message, opts.get('user'), opts.get('date'),
                                    match,