Mercurial > hg-stable

changeset 17149:4b33422e2572

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with crew-stable
author Martin Geisler <mg@aragost.com>
date Thu, 12 Jul 2012 13:33:53 +0200
parents 80e861511e2b (current diff) dd09bbd48646 (diff)
children 3ac9592b7ab4
files mercurial/commands.py
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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.