tests/test-merge5.out
author Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
Fri, 07 Nov 2008 10:29:35 +0100
changeset 7323 1c9f7aa7c8a5
parent 6381 0b89315d5de2
child 9717 68a1b9d0663e
permissions -rw-r--r--
graphlog: make some comment lines more like others in punctuation

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