[PATCH STABLE] templater: fix precedence of --style and --template options

[Pierre-Yves David]

On 09/30/2014 10:03 AM, Yuya Nishihara wrote:
> # HG changeset patch
> # User Yuya Nishihara <yuya at tcha.org>
> # Date 1412086556 -32400
> #      Tue Sep 30 23:15:56 2014 +0900
> # Branch stable
> # Node ID 8272dfdaa3985cb2ab59e479594a799e91da0395
> # Parent  a111e460318af49aeb6578cf142a63426c5e764d
> templater: fix precedence of --style and --template options

pushed to the clowncopter with the following tweak:

-    if not tmpl and not style:
+    if not tmpl and not style: # template are stronger than style

Thanks.

-- 
Pierre-Yves David