--- 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