comparison hgmerge @ 790:d7380783a086

Make test-pull work on slow machines, where hg serve needs some time to start.
author Thomas Arendsen Hein <thomas@intevation.de>
date Sat, 23 Jul 2005 17:09:37 +0100
parents 4fc63e22b1fe
children cd0ad12d9e42 8f5637f0a0c0 0902ffece4b4
comparison
equal deleted inserted replaced
789:8162ff905b33 790:d7380783a086