changeset 3674 | 9103dab96093 |
parent 3389 | efbe24c7d8d9 |
child 4311 | 4787e2b0dd03 |
--- 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