Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge8.out @ 4383:1bcf38111877
Update copyright year and change to range
author | Lee Cantey <lcantey@gmail.com> |
---|---|
date | Fri, 27 Apr 2007 16:04:17 -0700 |
parents | 4787e2b0dd03 |
children | bb1800a7d7e1 |
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) merging a and b 0 files updated, 1 files merged, 0 files removed, 0 files unresolved