--- a/tests/test-globalopts.t	Fri Oct 15 03:30:38 2010 -0300
+++ b/tests/test-globalopts.t	Wed Oct 20 15:09:38 2010 -0500
@@ -339,6 +339,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
@@ -413,6 +414,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