diff mercurial/merge.py @ 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 8aee687f0214
children 10edaed7f909 c04c96504a12
line wrap: on
line diff