tests/test-merge5.out
author Martin Geisler <mg@lazybytes.net>
Fri, 16 Jul 2010 14:44:30 +0200
branchstable
changeset 11600 76454cbc11e4
parent 9717 68a1b9d0663e
permissions -rw-r--r--
mark ui.warn strings for 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' to merge or use 'hg update -C' to discard changes)
% should succeed
1 files updated, 0 files merged, 0 files removed, 0 files unresolved