tests/test-merge5.out
author Arne Babenhauserheide <bab@draketo.de>
Fri, 05 Jun 2009 15:08:45 +0200
changeset 8722 48da69ff79bd
parent 6381 0b89315d5de2
child 9717 68a1b9d0663e
permissions -rw-r--r--
Some platforms lack the PATH_MAX definition (eg. GNU/Hurd). Thanks to ronny for making it cleaner.

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