--- a/mercurial/cmdutil.py	Sat Feb 25 19:28:16 2017 +0900
+++ b/mercurial/cmdutil.py	Sat Feb 25 19:32:39 2017 +0900
@@ -2768,6 +2768,7 @@
     while forms:
         tmpl = repo.ui.config('committemplate', '.'.join(forms))
         if tmpl:
+            tmpl = templater.unquotestring(tmpl)
             templatetext = committext = buildcommittemplate(
                 repo, ctx, subs, extramsg, tmpl)
             break

--- a/tests/test-commit.t	Sat Feb 25 19:28:16 2017 +0900
+++ b/tests/test-commit.t	Sat Feb 25 19:32:39 2017 +0900
@@ -387,12 +387,12 @@
 
   $ cat >> .hg/hgrc <<EOF
   > [committemplate]
-  > changeset.commit.normal = HG: this is "commit.normal" template
+  > changeset.commit.normal = 'HG: this is "commit.normal" template
   >     HG: {extramsg}
   >     {if(activebookmark,
   >    "HG: bookmark '{activebookmark}' is activated\n",
   >    "HG: no bookmark is activated\n")}{subrepos %
-  >    "HG: subrepo '{subrepo}' is changed\n"}
+  >    "HG: subrepo '{subrepo}' is changed\n"}'
   > 
   > changeset.commit = HG: this is "commit" template
   >     HG: {extramsg}