changeset 3002 | a31557193f3c |
parent 2973 | fb493241d7f6 |
child 3006 | 87a0332ab58b |
--- a/tests/test-up-local-change.out +++ b/tests/test-up-local-change.out @@ -137,4 +137,5 @@ adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files -1 files updated, 0 files merged, 0 files removed, 0 files unresolved +merging a +0 files updated, 1 files merged, 0 files removed, 0 files unresolved