tests/test-merge8.out
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Sat, 07 Apr 2007 04:45:27 -0300
changeset 4325 aa26759c6fb3
parent 4311 4787e2b0dd03
child 4416 bb1800a7d7e1
permissions -rw-r--r--
Merge with crew-stable.

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