Mercurial > hg

changeset 19217:2b4344f23b44 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
help: fix role/option confusion in RST RST's role syntax means something different sometimes when it's in some places that are poorly documented and vary betwen minirst and docutils. Line wrapping will thus sometimes break everything.
author Matt Mackall <mpm@selenic.com>
date Tue, 21 May 2013 15:23:50 -0500
parents 865beb849720
children 475a4b13263f
files mercurial/commands.py
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/commands.py	Fri May 17 14:31:06 2013 -0500
+++ b/mercurial/commands.py	Tue May 21 15:23:50 2013 -0500
@@ -4918,8 +4918,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.