merge with stable
authorMartin Geisler <mg@aragost.com>
Tue, 29 Mar 2011 16:25:48 +0200
changeset 13793 ba58c5a61503
parent 13792 a916e8de4313 (current diff)
parent 13791 794f4476b974 (diff)
child 13795 43b5fe18ea6c
merge with stable
hgext/mq.py
--- a/hgext/mq.py	Mon Mar 28 23:16:20 2011 -0400
+++ b/hgext/mq.py	Tue Mar 29 16:25:48 2011 +0200
@@ -2623,8 +2623,8 @@
     selected guard, but will not be pushed if any negative guards
     match the current guard. For example::
 
-        qguard foo.patch -stable    (negative guard)
-        qguard bar.patch +stable    (positive guard)
+        qguard foo.patch -- -stable    (negative guard)
+        qguard bar.patch    +stable    (positive guard)
         qselect stable
 
     This activates the "stable" guard. mq will skip foo.patch (because