tests/test-merge5.out
author Mads Kiilerich <mads@kiilerich.com>
Thu, 27 Nov 2008 00:57:30 +0100
changeset 7428 fdcde929ce4f
parent 6381 0b89315d5de2
child 9717 68a1b9d0663e
permissions -rw-r--r--
tests: use killdaemons in hgweb tests hgweb tests often failed on my system because the serve port wasn't free when a new hgweb was started; the killed hg wasn't completely dead yet. Now we use killdaemons which waits for the process to die.

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
removing b
created new head
% should abort
abort: crosses branches (use 'hg merge' or 'hg update -C' to discard changes)
% should succeed
abort: crosses branches (use 'hg merge' or 'hg update -C')