diff mercurial/cmdutil.py @ 20072:6d4fda48b4e3

merge with stable
author Matt Mackall <mpm@selenic.com>
date Tue, 19 Nov 2013 11:29:56 -0500
parents f962870712da 64b4f0cd7336
children a6cf48b2880d b0153cb8b64e
line wrap: on
line diff
--- a/mercurial/cmdutil.py	Sun Nov 17 20:22:59 2013 -0500
+++ b/mercurial/cmdutil.py	Tue Nov 19 11:29:56 2013 -0500
@@ -940,9 +940,7 @@
 
     tmpl = opts.get('template')
     style = None
-    if tmpl:
-        tmpl = templater.parsestring(tmpl, quoted=False)
-    else:
+    if not tmpl:
         style = opts.get('style')
 
     # ui settings