Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
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 stable
authorYuya Nishihara <yuya@tcha.org>
Tue, 23 Jan 2018 21:14:36 +0900
branchstable
changeset 35801 373fb3f5922c
parent 35800 d5288b966e2f
child 35802 bbc07357b567
help: do not suggest "update --clean ." to cancel uncommitted merge Follows up 41ef02ba329b.
mercurial/commands.py file | annotate | diff | comparison | revisions 
--- 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`).
Mercurial