tests/test-merge6.out
changeset 9611 a3d73b3e1f8a
parent 6338 0750f11152fe
--- a/tests/test-merge6.out	Mon Oct 19 22:19:28 2009 +0300
+++ b/tests/test-merge6.out	Fri Oct 16 23:57:34 2009 +0200
@@ -1,8 +1,8 @@
-updating working directory
+updating to branch default
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
-updating working directory
+updating to branch default
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-updating working directory
+updating to branch default
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 pulling from ../B1
 searching for changes