tests/test-merge5.out
author Ronny Pfannschmidt <Ronny.Pfannschmidt@gmx.de>
Thu, 27 May 2010 17:47:40 +0200
changeset 11230 5116a077c3da
parent 9717 68a1b9d0663e
permissions -rw-r--r--
make transactions work on non-refcounted python implementations

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