tests/test-merge5.out
author Matt Mackall <mpm@selenic.com>
Thu, 26 Aug 2010 11:00:42 -0500
branchstable
changeset 12052 a4fc3444c542
parent 9717 68a1b9d0663e
permissions -rw-r--r--
Added tag 1.6.3 for changeset ff5cec76b1c5

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