Mercurial > hg
view tests/test-merge8.out @ 9980:2ba40cdaacb2
Merge with stable
author | Martin Geisler <mg@lazybytes.net> |
---|---|
date | Tue, 01 Dec 2009 00:48:25 +0100 |
parents | a3d73b3e1f8a |
children |
line wrap: on
line source
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