changeset 4304 | 4787e2b0dd03 |
parent 3674 | 9103dab96093 |
child 4416 | bb1800a7d7e1 |
--- a/tests/test-merge8.out Fri Mar 23 00:12:28 2007 -0500 +++ b/tests/test-merge8.out Thu Apr 05 16:43:18 2007 -0500 @@ -6,4 +6,5 @@ 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 +merging a and b +0 files updated, 1 files merged, 0 files removed, 0 files unresolved