tests/test-merge5.out
author Martin Geisler <mg@daimi.au.dk>
Sat, 14 Feb 2009 01:07:44 +0100
changeset 7761 1e70db1825d2
parent 6381 0b89315d5de2
child 9717 68a1b9d0663e
permissions -rw-r--r--
i18n: add python-format comments to Japanese translation

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