view tests/test-merge4.out @ 4535:121999244123

hg serve: don't lookup user-supplied names/addresses
author Matt Mackall <mpm@selenic.com>
date Sun, 10 Jun 2007 19:16:20 -0500
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)