tests/test-merge5.out
author Thomas Arendsen Hein <thomas@intevation.de>
Mon, 24 Mar 2008 20:28:13 +0100
changeset 6381 0b89315d5de2
parent 6375 cdc458b12f0f
child 9717 68a1b9d0663e
permissions -rw-r--r--
Fix missing space in one of the new update messages.

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')