tests/test-merge5.out
author Martin Geisler <mg@aragost.com>
Tue, 15 Jun 2010 09:53:50 +0200
changeset 11342 aecabad8dd7a
parent 9717 68a1b9d0663e
permissions -rw-r--r--
commands: get rid of generic exception in debugbuilddag

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