Mercurial > hg > gitweb
view tests/test-merge8.out @ 4312:82be6af21697
Merge with Matt
author | Brendan Cully <brendan@kublai.com> |
---|---|
date | Thu, 05 Apr 2007 14:55:27 -0700 |
parents | 9103dab96093 |
children | 4787e2b0dd03 |
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