diff tests/test-simplemerge-cmd.out @ 7574:4afc3208a7b8

tests: use killdaemons.py in test-pull-http
author Dirkjan Ochtman <dirkjan@ochtman.nl>
date Sat, 03 Jan 2009 20:20:40 +0100
parents ea7b982b6c08
children e1f4343db740
line wrap: on
line diff