Mercurial > hg > gitweb

changeset 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 7a87aebd848e
children ffb895f16925 b075216da118 0b4bff2b0ce3
files tests/run-tests.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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",