tests/test-merge5.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Fri, 20 Nov 2009 02:34:56 +0100
changeset 9898 b5170b8b32a5
parent 9717 68a1b9d0663e
permissions -rw-r--r--
merge with 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' to merge or use 'hg update -C' to discard changes)
% should succeed
1 files updated, 0 files merged, 0 files removed, 0 files unresolved