changeset 20072 | 6d4fda48b4e3 |
parent 20033 | f962870712da |
parent 20066 | 64b4f0cd7336 |
child 20364 | a6cf48b2880d |
child 20700 | b0153cb8b64e |
--- 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