# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 2010-10-20 20:09:38
# Node ID e8a8993b625e246dd21f6c299dae473b172348ec
# Parent  9aae04f4fcf6984e1ca8ea24ddd14b6622114884

tests: fix up changed output

diff --git a/tests/test-convert.t b/tests/test-convert.t
--- a/tests/test-convert.t
+++ b/tests/test-convert.t
@@ -121,7 +121,7 @@
       to a named branch.
   
       Mercurial Source
-      ----------------
+      ''''''''''''''''
   
       --config convert.hg.ignoreerrors=False    (boolean)
           ignore integrity errors when reading. Use it to fix Mercurial
@@ -135,7 +135,7 @@
           convert start revision and its descendants
   
       CVS Source
-      ----------
+      ''''''''''
   
       CVS source will use a sandbox (i.e. a checked-out copy) from CVS to
       indicate the starting point of what will be converted. Direct access to
@@ -187,7 +187,7 @@
       more details.
   
       Subversion Source
-      -----------------
+      '''''''''''''''''
   
       Subversion source detects classical trunk/branches/tags layouts. By
       default, the supplied "svn://repo/path/" source URL is converted as a
@@ -216,7 +216,7 @@
           specify start Subversion revision.
   
       Perforce Source
-      ---------------
+      '''''''''''''''
   
       The Perforce (P4) importer can be given a p4 depot path or a client
       specification as source. It will convert all files in the source to a flat
@@ -231,7 +231,7 @@
           specify initial Perforce revision.
   
       Mercurial Destination
-      ---------------------
+      '''''''''''''''''''''
   
       --config convert.hg.clonebranches=False   (boolean)
           dispatch source branches in separate clones.
diff --git a/tests/test-globalopts.t b/tests/test-globalopts.t
--- a/tests/test-globalopts.t
+++ b/tests/test-globalopts.t
@@ -339,6 +339,7 @@ Testing -h/--help:
    multirevs    Specifying Multiple Revisions
    revsets      Specifying Revision Sets
    diffs        Diff Formats
+   merge-tools  Merge Tools
    templating   Template Usage
    urls         URL Paths
    extensions   Using additional features
@@ -413,6 +414,7 @@ Testing -h/--help:
    multirevs    Specifying Multiple Revisions
    revsets      Specifying Revision Sets
    diffs        Diff Formats
+   merge-tools  Merge Tools
    templating   Template Usage
    urls         URL Paths
    extensions   Using additional features
diff --git a/tests/test-help.t b/tests/test-help.t
--- a/tests/test-help.t
+++ b/tests/test-help.t
@@ -110,6 +110,7 @@ Short help:
    multirevs    Specifying Multiple Revisions
    revsets      Specifying Revision Sets
    diffs        Diff Formats
+   merge-tools  Merge Tools
    templating   Template Usage
    urls         URL Paths
    extensions   Using additional features
@@ -180,6 +181,7 @@ Short help:
    multirevs    Specifying Multiple Revisions
    revsets      Specifying Revision Sets
    diffs        Diff Formats
+   merge-tools  Merge Tools
    templating   Template Usage
    urls         URL Paths
    extensions   Using additional features
@@ -702,6 +704,7 @@ Test that default list of commands omits
    multirevs    Specifying Multiple Revisions
    revsets      Specifying Revision Sets
    diffs        Diff Formats
+   merge-tools  Merge Tools
    templating   Template Usage
    urls         URL Paths
    extensions   Using additional features