--- a/tests/test-up-local-change.out	Tue Aug 22 16:47:27 2006 -0500
+++ b/tests/test-up-local-change.out	Tue Aug 22 17:08:38 2006 -0500
@@ -137,4 +137,5 @@
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files
-1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+merging a
+0 files updated, 1 files merged, 0 files removed, 0 files unresolved