# HG changeset patch
# User Martin Geisler <mg@aragost.com>
# Date 1342092833 -7200
# Node ID 4b33422e2572ca93e991195d93b7fe44896c2bd1
# Parent  80e861511e2b1a61ba0e8bed60e3cb0b75624e3d# Parent  dd09bbd48646550a62122efe36b66cb08160e956
merge with crew-stable

diff -r 80e861511e2b -r 4b33422e2572 mercurial/commands.py
--- a/mercurial/commands.py	Fri Jul 06 22:43:10 2012 +0200
+++ b/mercurial/commands.py	Thu Jul 12 13:33:53 2012 +0200
@@ -4908,8 +4908,10 @@
     """restore files to their checkout state
 
     .. note::
+
        To check out earlier revisions, you should use :hg:`update REV`.
-       To cancel a merge (and lose your changes), use :hg:`update --clean .`.
+       To cancel an uncommitted merge (and lose your changes), use
+       :hg:`update --clean .`.
 
     With no revision specified, revert the specified files or directories
     to the contents they had in the parent of the working directory.