tests/test-merge5.out
author Martin Geisler <mg@lazybytes.net>
Thu, 23 Jul 2009 00:25:54 +0200
changeset 9216 9b2649b6ce5c
parent 6381 0b89315d5de2
child 9717 68a1b9d0663e
permissions -rw-r--r--
win32mbcs: fix formatting of lists with proper reST markup

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