diff mercurial/ui.py @ 11311:fcd06ecd4cb7

Merge backout
author Steve Borho <steve@borho.org>
date Tue, 08 Jun 2010 15:52:56 -0500
parents ef7636efeb01 ac873ecfc3c2
children cdf6d861b207
line wrap: on
line diff
--- a/mercurial/ui.py	Tue Jun 08 21:09:41 2010 +0200
+++ b/mercurial/ui.py	Tue Jun 08 15:52:56 2010 -0500
@@ -546,9 +546,5 @@
 
         ui.write(s, 'label') is equivalent to
         ui.write(ui.label(s, 'label')).
-
-        Callers of ui.label() should pass labeled text back to
-        ui.write() with a label of 'ui.labeled' so implementations know
-        that the text has already been escaped and marked up.
         '''
         return msg