Mercurial > hg > mercurial-crew-with-dirclash

comparison 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
comparison
equal deleted inserted replaced
2610:7a87aebd848e 2611:1b4eb1f92433
17 import signal 17 import signal
18 import sys 18 import sys
19 import tempfile 19 import tempfile
20 import time 20 import time
21 21
22 required_tools = ["python", "diff", "grep", "unzip", "gunzip", "bunzip2", "sed"] 22 required_tools = ["python", "diff", "grep", "unzip", "gunzip", "bunzip2", "sed", "merge"]
23 23
24 parser = optparse.OptionParser("%prog [options] [tests]") 24 parser = optparse.OptionParser("%prog [options] [tests]")
25 parser.add_option("-v", "--verbose", action="store_true", 25 parser.add_option("-v", "--verbose", action="store_true",
26 help="output verbose messages") 26 help="output verbose messages")
27 parser.add_option("-t", "--timeout", type="int", 27 parser.add_option("-t", "--timeout", type="int",