tests/test-merge8.out
author Bryan O'Sullivan <bos@serpentine.com>
Mon, 27 Aug 2007 13:38:34 -0700
changeset 5257 fd371f99f20b
parent 4416 bb1800a7d7e1
child 6338 0750f11152fe
permissions -rw-r--r--
Automated merge with http://hg.intevation.org/mercurial/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)
1 files updated, 0 files merged, 1 files removed, 0 files unresolved