tests/test-merge8.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Sat, 18 Apr 2009 16:44:24 +0200
changeset 8078 ab55a5122ea3
parent 6338 0750f11152fe
child 9611 a3d73b3e1f8a
permissions -rw-r--r--
merge with crew

updating working directory
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