tests/test-merge5.out
author Fabian Kreutz <fabian.kreutz@starnet.fi>
Mon, 02 Nov 2009 17:25:43 +0200
changeset 9775 fb7f02082eab
parent 6381 0b89315d5de2
child 9717 68a1b9d0663e
permissions -rw-r--r--
i18n-de: Update msgids, remove .txt linespecs + few small translations

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