Mercurial > hg

diff tests/test-globalopts.t @ 12789:24999db620cd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with mpm
author Steve Borho <steve@borho.org>
date Wed, 20 Oct 2010 15:36:42 -0500
parents e8a8993b625e
children af1006d2f970
line wrap: on
line diff
--- a/tests/test-globalopts.t	Tue Oct 19 22:33:52 2010 -0500
+++ b/tests/test-globalopts.t	Wed Oct 20 15:36:42 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