Mercurial Mercurial > hg / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-globalopts.t
changeset 12787 e8a8993b625e
parent 12637 42ca7aef28d3
child 12828 af1006d2f970 
--- 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
Mercurial