##// END OF EJS Templates
help: do not suggest "update --clean ." to cancel uncommitted merge...
Yuya Nishihara -
r35819:373fb3f5 stable
parent child Browse files
Show More
@@ -4560,7 +4560,7 b' def revert(ui, repo, *pats, **opts):'
4560 4560
4561 4561 To check out earlier revisions, you should use :hg:`update REV`.
4562 4562 To cancel an uncommitted merge (and lose your changes),
4563 use :hg:`update --clean .`.
4563 use :hg:`merge --abort`.
4564 4564
4565 4565 With no revision specified, revert the specified files or directories
4566 4566 to the contents they had in the parent of the working directory.
@@ -5501,7 +5501,7 b' def update(ui, repo, node=None, rev=None'
5501 5501 the working directory is updated to the requested changeset.
5502 5502
5503 5503 To cancel an uncommitted merge (and lose your changes), use
5504 :hg:`update --clean .`.
5504 :hg:`merge --abort`.
5505 5505
5506 5506 Use null as the changeset to remove the working directory (like
5507 5507 :hg:`clone -U`).
General Comments 0
You need to be logged in to leave comments. Login now