--- a/tests/test-copy-move-merge.out Wed Oct 03 17:17:28 2007 -0500
+++ b/tests/test-copy-move-merge.out Thu Oct 04 19:44:37 2007 -0500
@@ -2,6 +2,14 @@
resolving manifests
overwrite None partial False
ancestor 583c7b748052 local fb3948d97f07+ remote 40da226db0f0
+ searching for copies back to rev 1
+ unmatched files in other:
+ b
+ c
+ all copies found (* = to merge, ! = divergent):
+ c -> a *
+ b -> a *
+ checking for directory renames
a: remote moved to c -> m
a: remote moved to b -> m
copying a to b