Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-merge8.out @ 3674:9103dab96093
avoid unnecessary copy merges
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sat, 18 Nov 2006 11:34:19 -0600 |
parents | efbe24c7d8d9 |
children | 4787e2b0dd03 |
line wrap: on
line diff
--- a/tests/test-merge8.out +++ b/tests/test-merge8.out @@ -6,5 +6,4 @@ 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 +1 files updated, 0 files merged, 1 files removed, 0 files unresolved