tests/test-merge5.out
author Alexander Solovyov <piranha@piranha.org.ua>
Fri, 30 Oct 2009 15:43:01 +0200
changeset 9672 5bbf4f130684
parent 6381 0b89315d5de2
child 9717 68a1b9d0663e
permissions -rw-r--r--
churn: fix --progress (broken by f3d60543924f)

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' or 'hg update -C' to discard changes)
% should succeed
abort: crosses branches (use 'hg merge' or 'hg update -C')