Mercurial > public > mercurial-scm > hg

diff mercurial/commands.py @ 19225:6cf8e3b4e074

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Matt Mackall <mpm@selenic.com>
date Tue, 21 May 2013 15:32:15 -0500
parents 3bfd7f1e7485 2b4344f23b44
children 7bbad79b9542
line wrap: on
line diff
--- a/mercurial/commands.py	Fri May 17 17:22:08 2013 -0500
+++ b/mercurial/commands.py	Tue May 21 15:32:15 2013 -0500
@@ -4935,8 +4935,8 @@
 
     .. note::
        To check out earlier revisions, you should use :hg:`update REV`.
-       To cancel an uncommitted 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.