equal
deleted
inserted
replaced
4558 |
4558 |
4559 .. note:: |
4559 .. note:: |
4560 |
4560 |
4561 To check out earlier revisions, you should use :hg:`update REV`. |
4561 To check out earlier revisions, you should use :hg:`update REV`. |
4562 To cancel an uncommitted merge (and lose your changes), |
4562 To cancel an uncommitted merge (and lose your changes), |
4563 use :hg:`update --clean .`. |
4563 use :hg:`merge --abort`. |
4564 |
4564 |
4565 With no revision specified, revert the specified files or directories |
4565 With no revision specified, revert the specified files or directories |
4566 to the contents they had in the parent of the working directory. |
4566 to the contents they had in the parent of the working directory. |
4567 This restores the contents of files to an unmodified |
4567 This restores the contents of files to an unmodified |
4568 state and unschedules adds, removes, copies, and renames. If the |
4568 state and unschedules adds, removes, copies, and renames. If the |
5499 |
5499 |
5500 4. With the -C/--clean option, uncommitted changes are discarded and |
5500 4. With the -C/--clean option, uncommitted changes are discarded and |
5501 the working directory is updated to the requested changeset. |
5501 the working directory is updated to the requested changeset. |
5502 |
5502 |
5503 To cancel an uncommitted merge (and lose your changes), use |
5503 To cancel an uncommitted merge (and lose your changes), use |
5504 :hg:`update --clean .`. |
5504 :hg:`merge --abort`. |
5505 |
5505 |
5506 Use null as the changeset to remove the working directory (like |
5506 Use null as the changeset to remove the working directory (like |
5507 :hg:`clone -U`). |
5507 :hg:`clone -U`). |
5508 |
5508 |
5509 If you want to revert just one file to an older revision, use |
5509 If you want to revert just one file to an older revision, use |