# HG changeset patch
# User Lee Cantey <lcantey@gmail.com>
# Date 1152809451 25200
# Node ID 1b4eb1f924330227e33e462ee5e508fd8775432b
# Parent  7a87aebd848e3c37861d0f21dd1a592e8d0611a3
Add merge to list of required tools.

diff --git a/tests/run-tests.py b/tests/run-tests.py
--- 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",