tests/test-merge8.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Mon, 30 Nov 2009 16:53:05 +0100
changeset 9955 7bcbdefcd93a
parent 9611 a3d73b3e1f8a
permissions -rw-r--r--
merge with stable

updating to branch default
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