tests/test-merge5.out
author Matt Mackall <mpm@selenic.com>
Thu, 01 Jul 2010 11:20:08 -0500
branchstable
changeset 11484 44b4873ea59b
parent 9717 68a1b9d0663e
permissions -rw-r--r--
Merge with i18n

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