tests/test-merge6.out
changeset 6338 0750f11152fe
parent 5405 8feb33c2d153
child 9611 a3d73b3e1f8a
--- a/tests/test-merge6.out	Fri Mar 21 12:05:01 2008 +0100
+++ b/tests/test-merge6.out	Fri Mar 21 14:52:24 2008 +0100
@@ -1,5 +1,8 @@
+updating working directory
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
+updating working directory
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+updating working directory
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 pulling from ../B1
 searching for changes