tests/test-rename-dir-merge2.out
changeset 6338 0750f11152fe
parent 5610 2493a478f395
child 9611 a3d73b3e1f8a
--- a/tests/test-rename-dir-merge2.out	Fri Mar 21 12:05:01 2008 +0100
+++ b/tests/test-rename-dir-merge2.out	Fri Mar 21 14:52:24 2008 +0100
@@ -1,4 +1,5 @@
 adding a/f
+updating working directory
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 moving a/f to b/f
 adding a/aa/g