tests/test-merge5.out
author Matt Mackall <mpm@selenic.com>
Thu, 13 May 2010 11:30:49 -0500
branchstable
changeset 11170 08578751a20f
parent 9717 68a1b9d0663e
permissions -rw-r--r--
Added tag 1.5.3 for changeset fdcf80f26604

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