diff -r 7a87aebd848e -r 1b4eb1f92433 tests/run-tests.py
--- 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",