# HG changeset patch
# User Martin Geisler <mg@aragost.com>
# Date 1301408748 -7200
# Node ID ba58c5a615038ac661a3fdedf127b61b3c4963f4
# Parent  a916e8de43133d4abc9b46a00dee8c37cb9510ad# Parent  794f4476b9746eea96a5f1b1d128a9290a7df4d7
merge with stable

diff -r a916e8de4313 -r ba58c5a61503 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