tests/test-merge5.out
author Cédric Duval <cedricduval@free.fr>
Fri, 10 Jul 2009 19:45:31 +0200
changeset 9130 335f749cc369
parent 6381 0b89315d5de2
child 9717 68a1b9d0663e
permissions -rw-r--r--
gendoc: fall back to pure modules if C extensions are not available (issue1711)

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