--- 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
--- a/tests/test-manifest-merging.out Tue Oct 10 21:03:24 2006 +0300
+++ b/tests/test-manifest-merging.out Wed Oct 11 15:52:08 2006 -0500
@@ -8,13 +8,6 @@
% create gamma in first repo
adding gamma
% pull into work and merge
-pulling from /tmp/hgtests.H64eVH/test-manifest-merging/foo-base
-searching for changes
-adding changesets
-adding manifests
-adding file changes
-added 1 changesets with 1 changes to 1 files (+1 heads)
-(run 'hg heads' to see heads, 'hg merge' to merge)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
% revert to changeset 1 to simulate a failed merge