Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add merge to list of required tools.
authorLee Cantey <lcantey@gmail.com>
Thu, 13 Jul 2006 09:50:51 -0700
changeset 2611 1b4eb1f92433
parent 2610 7a87aebd848e
child 2612 ffb895f16925
child 2615 b075216da118
child 2617 0b4bff2b0ce3
Add merge to list of required tools.
tests/run-tests.py file | annotate | diff | comparison | revisions 
--- a/tests/run-tests.py	Thu Jul 13 11:19:35 2006 -0700
+++ b/tests/run-tests.py	Thu Jul 13 09:50:51 2006 -0700
@@ -19,7 +19,7 @@
 import tempfile
 import time
 
-required_tools = ["python", "diff", "grep", "unzip", "gunzip", "bunzip2", "sed"]
+required_tools = ["python", "diff", "grep", "unzip", "gunzip", "bunzip2", "sed", "merge"]
 
 parser = optparse.OptionParser("%prog [options] [tests]")
 parser.add_option("-v", "--verbose", action="store_true",
mercurial