tests/test-merge5.out
author Martin Geisler <mg@lazybytes.net>
Sun, 25 Oct 2009 12:50:30 +0100
changeset 9770 afe646dd78fc
parent 6381 0b89315d5de2
child 9717 68a1b9d0663e
permissions -rw-r--r--
i18n-zh_TW: synchronized with e06c940d554d

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')