tests/test-merge8.out
author Thomas Arendsen Hein <thomas@intevation.de>
Tue, 26 Dec 2006 14:54:48 +0100
changeset 3989 e492ab235b4d
parent 3674 9103dab96093
child 4311 4787e2b0dd03
permissions -rw-r--r--
sync with 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)
1 files updated, 0 files merged, 1 files removed, 0 files unresolved