view tests/test-merge8.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 bb1800a7d7e1
children
line wrap: on
line source

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