tests/test-merge5.out
author Martin Geisler <mg@lazybytes.net>
Sun, 10 May 2009 01:18:38 +0200
changeset 8348 c9ab8f448a9e
parent 6381 0b89315d5de2
child 9717 68a1b9d0663e
permissions -rw-r--r--
record: better formatting for qrecord help

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