tests/test-merge8.out
author Matt Mackall <mpm@selenic.com>
Wed, 06 Dec 2006 13:13:44 -0600
changeset 3812 1d571ed26eed
parent 3674 9103dab96093
child 4311 4787e2b0dd03
permissions -rw-r--r--
Update tests

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