Mercurial > hg

diff tests/test-help.t @ 12787:e8a8993b625e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: fix up changed output
author Matt Mackall <mpm@selenic.com>
date Wed, 20 Oct 2010 15:09:38 -0500
parents aff4afdcfd2b
children 0edc0aa7432d
line wrap: on
line diff
--- 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