tests/test-merge4.out
author Mark Edgington <edgimar@gmail.com>
Fri, 31 Oct 2008 15:28:06 +0100
changeset 7336 2dc868712dcc
parent 6336 4b0c9c674707
permissions -rw-r--r--
hgweb: support for deny_read/allow_read options reimplementation of a patch provided by Nilton Volpato. Folded into a single patch by Thomas Arendsen Hein.

0 files updated, 0 files merged, 1 files removed, 0 files unresolved
created new head
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)