tests/test-merge5.out
author Martin Geisler <mg@daimi.au.dk>
Sun, 25 Jan 2009 20:27:37 +0100
changeset 7712 9f9bbd33f71e
parent 6381 0b89315d5de2
child 9717 68a1b9d0663e
permissions -rw-r--r--
i18n: check format strings when building xx.mo files

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