diff mercurial/cmdutil.py @ 10250:af24805aa37c

Merge with crew-stab le
author Patrick Mezard <pmezard@gmail.com>
date Fri, 15 Jan 2010 10:38:11 +0100
parents 3af4b39afe2a 8ebb34b0f6f7
children fe699ca08a45
line wrap: on
line diff
--- a/mercurial/cmdutil.py	Thu Jan 14 16:43:14 2010 +0100
+++ b/mercurial/cmdutil.py	Fri Jan 15 10:38:11 2010 +0100
@@ -891,7 +891,7 @@
         if tmpl:
             tmpl = templater.parsestring(tmpl)
         else:
-            style = ui.config('ui', 'style')
+            style = util.expandpath(ui.config('ui', 'style', ''))
 
     if not (tmpl or style):
         return changeset_printer(ui, repo, patch, opts, buffered)