--- a/tests/test-rename-dir-merge.out	Fri Dec 07 02:03:42 2007 -0600
+++ b/tests/test-rename-dir-merge.out	Fri Dec 07 02:29:55 2007 -0600
@@ -1,10 +1,8 @@
 adding a/a
 adding a/b
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-copying a/a to b/a
-copying a/b to b/b
-removing a/a
-removing a/b
+moving a/a to b/a
+moving a/b to b/b
 2 files updated, 0 files merged, 2 files removed, 0 files unresolved
 resolving manifests
  overwrite None partial False