tests/test-merge5.out
author Patrick Mezard <pmezard@gmail.com>
Mon, 07 Jul 2008 09:16:09 +0200
changeset 6801 71e339714586
parent 6381 0b89315d5de2
child 9717 68a1b9d0663e
permissions -rw-r--r--
mq: fix qrefresh losing copy information (issue 1134)

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