changeset 5229 | dee573ba79f1 |
parent 4416 | bb1800a7d7e1 |
child 5371 | 17ed9b9a0d03 |
--- a/tests/test-rename-dir-merge.out Mon Aug 27 14:21:04 2007 -0300 +++ b/tests/test-rename-dir-merge.out Mon Aug 27 14:21:04 2007 -0300 @@ -29,6 +29,7 @@ R a/a R a/b R a/c +b/c renamed from a/c:354ae8da6e890359ef49ade27b68bbc361f3ca88 0 files updated, 0 files merged, 1 files removed, 0 files unresolved resolving manifests overwrite None partial False @@ -40,3 +41,4 @@ a/* b/a b/b b/c A b/c a/c +b/c renamed from a/c:354ae8da6e890359ef49ade27b68bbc361f3ca88