tests/test-merge5.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Fri, 16 Apr 2010 19:18:20 +0200
changeset 10935 5f10634f9e68
parent 9717 68a1b9d0663e
permissions -rw-r--r--
dirstate: remove unused variable

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