changeset 6338 | 0750f11152fe |
parent 5608 | 784eadabd985 |
child 7689 | d821ea464465 |
--- a/tests/test-rename-after-merge.out Fri Mar 21 12:05:01 2008 +0100 +++ b/tests/test-rename-after-merge.out Fri Mar 21 14:52:24 2008 +0100 @@ -1,6 +1,7 @@ % create source repository adding a % fork source repository +updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved adding b % update source repository