view tests/test-merge4.out @ 4387:80d3f6f0d8e5

hg serve: don't do DNS lookups
author Matt Mackall <mpm@selenic.com>
date Wed, 25 Apr 2007 13:35:18 -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)