tests/test-merge8.out
author Martin Geisler <mg@lazybytes.net>
Sun, 28 Feb 2010 18:06:47 +0100
changeset 10557 d1bbf01c4a8e
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