tests/test-merge5.out
author Martin Geisler <mg@lazybytes.net>
Sun, 13 Dec 2009 22:37:30 +0100
changeset 10064 6f30c35766d6
parent 9717 68a1b9d0663e
permissions -rw-r--r--
minirst: don't test regexps twice We know the regexps match since splitparagraphs used them too.

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' to merge or use 'hg update -C' to discard changes)
% should succeed
1 files updated, 0 files merged, 0 files removed, 0 files unresolved