Mercurial > hg-stable

changeset 17148:dd09bbd48646 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
revert: use term "uncommitted merge" in help text to make sure users can't possibly be mislead to try this for canceling a *merge changeset*.
author Adrian Buehlmann <adrian@cadifra.com>
date Mon, 09 Jul 2012 17:51:46 +0200
parents 71e36b3d2cc4
children 4b33422e2572 32b2e6d641e4
files mercurial/commands.py
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/commands.py	Tue Jul 10 21:26:18 2012 +0200
+++ b/mercurial/commands.py	Mon Jul 09 17:51:46 2012 +0200
@@ -4822,8 +4822,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.