Mercurial > hg-stable

changeset 19960:95304251c376 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
doc: put text into header of 1st column in table to generate page correctly >From the table without header text of 1st column, docutils generates the table with fully empty header row.
author FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
date Fri, 25 Oct 2013 01:14:18 +0900
parents 9ef92384415c
children 1d7a36ff2615
files mercurial/commands.py tests/test-help.t
diffstat 2 files changed, 9 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/commands.py	Fri Oct 25 01:14:18 2013 +0900
+++ b/mercurial/commands.py	Fri Oct 25 01:14:18 2013 +0900
@@ -4769,14 +4769,14 @@
       (as reported by :hg:`status`). The actions are Warn, Remove
       (from branch) and Delete (from disk):
 
-      ======= == == == ==
-              A  C  M  !
-      ======= == == == ==
-      none    W  RD W  R
-      -f      R  RD RD R
-      -A      W  W  W  R
-      -Af     R  R  R  R
-      ======= == == == ==
+      ========= == == == ==
+      opt/state A  C  M  !
+      ========= == == == ==
+      none      W  RD W  R
+      -f        R  RD RD R
+      -A        W  W  W  R
+      -Af       R  R  R  R
+      ========= == == == ==
 
       Note that remove never deletes files in Added [A] state from the
       working directory, not even if option --force is specified.
--- a/tests/test-help.t	Fri Oct 25 01:14:18 2013 +0900
+++ b/tests/test-help.t	Fri Oct 25 01:14:18 2013 +0900
@@ -1691,7 +1691,7 @@
   (from branch) and Delete (from disk):
   </p>
   <table>
-  <tr><td></td>
+  <tr><td>opt/state</td>
   <td>A</td>
   <td>C</td>
   <td>M</td>