tests/test-merge5.out
author Rocco Rutte <pdmef@gmx.net>
Fri, 05 Sep 2008 17:28:37 +0200
changeset 7029 b84d27386285
parent 6381 0b89315d5de2
child 9717 68a1b9d0663e
permissions -rw-r--r--
hgweb: Respond with HTTP 403 for disabled archive types instead of 404 This makes it easier for clients/users to distinct between supported but disabled and unsupported archive types.

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