branch | stable |
changeset 20066 | 64b4f0cd7336 |
parent 19944 | b7f76db06dc0 |
child 20072 | 6d4fda48b4e3 |
--- a/mercurial/cmdutil.py Thu Nov 07 20:36:26 2013 -0800 +++ b/mercurial/cmdutil.py Mon Nov 18 14:02:26 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