changeset 2611 | 1b4eb1f92433 |
parent 2576 | 6a961a54f953 |
child 2672 | 118b198c9423 |
child 2702 | 133811a7688b |
--- 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",