--- a/mercurial/cmdutil.py	Sat Sep 27 21:59:55 2014 +0900
+++ b/mercurial/cmdutil.py	Tue Sep 30 23:15:56 2014 +0900
@@ -1087,7 +1087,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:
@@ -1098,7 +1098,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)