tests/test-merge5.out
author Matt Mackall <mpm@selenic.com>
Mon, 16 Feb 2009 17:37:23 -0600
changeset 7784 8a217626bb0c
parent 6381 0b89315d5de2
child 9717 68a1b9d0663e
permissions -rw-r--r--
audit: check for casefolding of .hg (issue1450)

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')