Mercurial > public > mercurial-scm > hg-stable
diff mercurial/commands.py @ 17149:4b33422e2572
merge with crew-stable
author | Martin Geisler <mg@aragost.com> |
---|---|
date | Thu, 12 Jul 2012 13:33:53 +0200 |
parents | f7152a0d90df dd09bbd48646 |
children | e058f4eec69c |
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.