Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge8.out @ 4823:61343b40a141
Merge with main
author | Brendan Cully <brendan@kublai.com> |
---|---|
date | Thu, 05 Jul 2007 14:32:18 -0700 |
parents | bb1800a7d7e1 |
children |
line wrap: on
line source
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