tests/test-merge5.out
author Adrian Buehlmann <adrian@cadifra.com>
Wed, 13 Aug 2008 20:18:41 -0500
changeset 6892 dab95717058d
parent 6381 0b89315d5de2
child 9717 68a1b9d0663e
permissions -rw-r--r--
verify: check repo.store

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