tests/test-merge9.out

--- a/tests/test-merge9.out	Mon Mar 09 11:41:38 2009 -0500
+++ b/tests/test-merge9.out	Mon Mar 16 16:58:41 2009 -0500
@@ -23,6 +23,10 @@
 % show
 U bar
 U baz
+M bar
+M baz
+M quux2
+? bar.orig
 % re-resolve baz
 merging baz and foo to baz
 % after