changeset 6338 | 0750f11152fe |
parent 3326 | be8efb6e1cc6 |
child 9611 | a3d73b3e1f8a |
--- a/tests/test-manifest-merging.out Fri Mar 21 12:05:01 2008 +0100 +++ b/tests/test-manifest-merging.out Fri Mar 21 14:52:24 2008 +0100 @@ -2,6 +2,7 @@ % create alpha in first repo adding alpha % clone foo-base to foo-work +updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved % create beta in second repo adding beta