view tests/test-merge8.out @ 10317:192083a3e6fe stable

zeroconf: gethostbyaddr may also fail with socket.herror
author Augie Fackler <durin42@gmail.com>
date Fri, 05 Feb 2010 10:16:52 -0600
parents a3d73b3e1f8a
children
line wrap: on
line source

updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
pulling from ../a
searching for changes
adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 1 files
(run 'hg update' to get a working copy)
1 files updated, 0 files merged, 1 files removed, 0 files unresolved