tests/test-merge5.out
author Martin Geisler <mg@lazybytes.net>
Sun, 26 Jul 2009 02:03:35 +0200
changeset 9276 51e85071caf0
parent 6381 0b89315d5de2
child 9717 68a1b9d0663e
permissions -rw-r--r--
zeroconf: wrap docstrings at 70 characters

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