--- a/tests/test-rename-dir-merge2.out	Fri Dec 07 02:03:42 2007 -0600
+++ b/tests/test-rename-dir-merge2.out	Fri Dec 07 02:29:55 2007 -0600
@@ -1,7 +1,6 @@
 adding a/f
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-copying a/f to b/f
-removing a/f
+moving a/f to b/f
 adding a/aa/g
 pulling from ../r2
 searching for changes