tests/test-merge5.out
author Thomas Arendsen Hein <thomas@intevation.de>
Fri, 07 Jul 2006 11:23:53 +0200
changeset 2576 6a961a54f953
parent 2175 b2ae81a7df29
child 2830 49988d9f0758
permissions -rw-r--r--
Changed default timeout for run-tests.py from 30 to 180 seconds. As e.g. test-http-proxy already takes quite some time (about a minute here) and tests usually should clean up after themselves, the timeout should only be hit in case of other problems.

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
removing b
this update spans a branch affecting the following files:
 b
aborting update spanning branches!
(use 'hg merge' to merge across branches or 'hg update -C' to lose changes)