tests/test-merge5.out
author Nicolas Dumazet <nicdumz.commits@gmail.com>
Sun, 15 Aug 2010 21:41:45 +0900
changeset 11894 a15936ac7ec5
parent 9717 68a1b9d0663e
permissions -rw-r--r--
tests: unify test-mq

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