view tests/test-merge4.out @ 3543:f7dee427cd14

Turn of "Not trusting file" logging when running hgweb and hgwebdir (hg serve still shows the warning)
author Thomas Arendsen Hein <thomas@intevation.de>
date Thu, 26 Oct 2006 19:25:45 +0200
parents b2ae81a7df29
children
line wrap: on
line source

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