Mercurial > hg
view tests/test-merge8.out @ 4402:249e2603324c
Merge with crew-stable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Thu, 03 May 2007 17:26:21 -0500 |
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