tests/test-help.t
changeset 12787 e8a8993b625e
parent 12390 aff4afdcfd2b
child 12820 0edc0aa7432d
--- a/tests/test-help.t	Fri Oct 15 03:30:38 2010 -0300
+++ b/tests/test-help.t	Wed Oct 20 15:09:38 2010 -0500
@@ -110,6 +110,7 @@
    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 @@
    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 @@
    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