--- a/tests/test-manifest-merging Tue Oct 10 21:03:24 2006 +0300
+++ b/tests/test-manifest-merging Wed Oct 11 15:52:08 2006 -0500
@@ -26,7 +26,7 @@
echo % pull into work and merge
cd foo-work
-hg pull
+hg pull -q
hg merge
echo % revert to changeset 1 to simulate a failed merge