tests/test-merge5.out
author Nicolas Dumazet <nicdumz.commits@gmail.com>
Thu, 22 Jul 2010 15:14:22 +0900
changeset 11644 c4f6f0a1bd5a
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