tests/test-merge5.out
author Dirkjan Ochtman <dirkjan@ochtman.nl>
Sun, 29 Jun 2008 11:34:36 +0200
changeset 6781 b4b7261164d5
parent 6381 0b89315d5de2
child 9717 68a1b9d0663e
permissions -rw-r--r--
hgweb: protocol functions take repo instead of web This makes it much easier for implementers of hgweb alternatives to simply call into protocol functions after setting up a repo and a request.

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