tests/test-merge7.out
changeset 9611 a3d73b3e1f8a
parent 9468 b2310903c462
child 10431 ba5e508b5e92
--- a/tests/test-merge7.out	Mon Oct 19 22:19:28 2009 +0300
+++ b/tests/test-merge7.out	Fri Oct 16 23:57:34 2009 +0200
@@ -1,4 +1,4 @@
-updating working directory
+updating to branch default
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 pulling from ../test-a
 searching for changes