# HG changeset patch
# User Adrian Buehlmann <adrian@cadifra.com>
# Date 1342283386 -7200
# Node ID b8661d7c940f958e6540cf174cb88dc85468146b
# Parent  1b2b727a885f0fc71f36afe6a0b15e8c6bd823f3
update: put rules for uncommitted changes into verbose help section

diff -r 1b2b727a885f -r b8661d7c940f mercurial/commands.py
--- a/mercurial/commands.py	Fri Jul 06 18:41:25 2012 +0200
+++ b/mercurial/commands.py	Sat Jul 14 18:29:46 2012 +0200
@@ -5750,23 +5750,25 @@
     none are found, the working directory is updated to the specified
     changeset.
 
-    The following rules apply when the working directory contains
-    uncommitted changes:
-
-    1. If neither -c/--check nor -C/--clean is specified, and if
-       the requested changeset is an ancestor or descendant of
-       the working directory's parent, the uncommitted changes
-       are merged into the requested changeset and the merged
-       result is left uncommitted. If the requested changeset is
-       not an ancestor or descendant (that is, it is on another
-       branch), the update is aborted and the uncommitted changes
-       are preserved.
-
-    2. With the -c/--check option, the update is aborted and the
-       uncommitted changes are preserved.
-
-    3. With the -C/--clean option, uncommitted changes are discarded and
-       the working directory is updated to the requested changeset.
+    .. container:: verbose
+
+      The following rules apply when the working directory contains
+      uncommitted changes:
+
+      1. If neither -c/--check nor -C/--clean is specified, and if
+         the requested changeset is an ancestor or descendant of
+         the working directory's parent, the uncommitted changes
+         are merged into the requested changeset and the merged
+         result is left uncommitted. If the requested changeset is
+         not an ancestor or descendant (that is, it is on another
+         branch), the update is aborted and the uncommitted changes
+         are preserved.
+
+      2. With the -c/--check option, the update is aborted and the
+         uncommitted changes are preserved.
+
+      3. With the -C/--clean option, uncommitted changes are discarded and
+         the working directory is updated to the requested changeset.
 
     To cancel an uncommitted merge (and lose your changes), use
     :hg:`update --clean .`.