tests/test-merge8.out
author Matt Mackall <mpm@selenic.com>
Tue, 17 Oct 2006 18:54:37 -0500
changeset 3436 357b5589dc62
parent 3389 efbe24c7d8d9
child 3674 9103dab96093
permissions -rw-r--r--
Merge with crew

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)
merging a and b
0 files updated, 1 files merged, 0 files removed, 0 files unresolved