Mercurial > hg > mercurial-crew-with-dirclash

diff tests/run-tests.py @ 2611:1b4eb1f92433

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add merge to list of required tools.
author Lee Cantey <lcantey@gmail.com>
date Thu, 13 Jul 2006 09:50:51 -0700
parents 6a961a54f953
children 118b198c9423 133811a7688b
line wrap: on
line diff
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -19,7 +19,7 @@ import sys
 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",