diff mercurial/cmdutil.py @ 22588:cd1b43226b34

merge with stable

--- a/mercurial/cmdutil.py	Tue Sep 30 16:40:10 2014 -0500
+++ b/mercurial/cmdutil.py	Tue Sep 30 18:22:58 2014 -0500
@@ -1215,7 +1215,7 @@
     """
 
     # ui settings
-    if not tmpl and not style:
+    if not tmpl and not style: # template are stronger than style
         tmpl = ui.config('ui', 'logtemplate')
         if tmpl:
             try:
@@ -1226,7 +1226,7 @@
         else:
             style = util.expandpath(ui.config('ui', 'style', ''))
 
-    if style:
+    if not tmpl and style:
         mapfile = style
         if not os.path.split(mapfile)[0]:
             mapname = (templater.templatepath('map-cmdline.' + mapfile)