view tests/test-merge8.out @ 3928:4df475e22248

Sync with -stable
author Matt Mackall <mpm@selenic.com>
date Sun, 17 Dec 2006 21:48:22 -0600
parents 9103dab96093
children 4787e2b0dd03
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