tests/test-merge5.out
author Adrian Buehlmann <adrian@cadifra.com>
Wed, 23 Apr 2008 19:40:15 +0200
changeset 6612 59e087f99920
parent 6381 0b89315d5de2
child 9717 68a1b9d0663e
permissions -rw-r--r--
gendoc: add anchors for commands Enables links into hg.1.html of the form: hg.1.html#command

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