tests/test-merge5.out
author Brendan Cully <brendan@kublai.com>
Tue, 09 Dec 2008 17:02:52 -0800
changeset 7497 f598df061fec
parent 6381 0b89315d5de2
child 9717 68a1b9d0663e
permissions -rw-r--r--
Merge with crew-stable

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