Mercurial > public > mercurial-scm > hg-stable

diff mercurial/commands.py @ 35801:373fb3f5922c stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
help: do not suggest "update --clean ." to cancel uncommitted merge Follows up 41ef02ba329b.
author Yuya Nishihara <yuya@tcha.org>
date Tue, 23 Jan 2018 21:14:36 +0900
parents 854a7315603e
children eedc69d2776d 555bc4ab37ad
line wrap: on
line diff
--- a/mercurial/commands.py	Wed Jan 24 22:26:28 2018 -0500
+++ b/mercurial/commands.py	Tue Jan 23 21:14:36 2018 +0900
@@ -4560,7 +4560,7 @@
 
        To check out earlier revisions, you should use :hg:`update REV`.
        To cancel an uncommitted merge (and lose your changes),
-       use :hg:`update --clean .`.
+       use :hg:`merge --abort`.
 
     With no revision specified, revert the specified files or directories
     to the contents they had in the parent of the working directory.
@@ -5501,7 +5501,7 @@
          the working directory is updated to the requested changeset.
 
     To cancel an uncommitted merge (and lose your changes), use
-    :hg:`update --clean .`.
+    :hg:`merge --abort`.
 
     Use null as the changeset to remove the working directory (like
     :hg:`clone -U`).