tests/test-merge5.out
author Giorgos Keramidas <keramida@ceid.upatras.gr>
Thu, 03 Dec 2009 22:32:13 +0200
changeset 10036 928a01feb4a9
parent 9717 68a1b9d0663e
permissions -rw-r--r--
i18n-el: remove obsolete 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' to merge or use 'hg update -C' to discard changes)
% should succeed
1 files updated, 0 files merged, 0 files removed, 0 files unresolved