tests/test-merge5.out
author Thomas Arendsen Hein <thomas@intevation.de>
Sat, 05 Apr 2008 00:11:36 +0200
changeset 6477 301d2441fae2
parent 6381 0b89315d5de2
child 9717 68a1b9d0663e
permissions -rw-r--r--
Make tests/test-dumprevlog executable

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