tests/test-merge5.out
author Martin Geisler <mg@lazybytes.net>
Sun, 15 Aug 2010 17:49:59 +0200
branchstable
changeset 11885 08cd25ef8a38
parent 9717 68a1b9d0663e
permissions -rw-r--r--
dagparser: transplant part of 4e804302d30c

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