tests/test-merge5.out
author Matt Mackall <mpm@selenic.com>
Tue, 22 Jul 2008 13:03:14 -0500
changeset 6822 1e2850ed8171
parent 6381 0b89315d5de2
child 9717 68a1b9d0663e
permissions -rw-r--r--
dirstate: simplify normalize logic

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' or 'hg update -C' to discard changes)
% should succeed
abort: crosses branches (use 'hg merge' or 'hg update -C')