diff --git a/tests/test-manifest-merging b/tests/test-manifest-merging --- a/tests/test-manifest-merging +++ b/tests/test-manifest-merging @@ -26,7 +26,7 @@ cd .. 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 diff --git a/tests/test-manifest-merging.out b/tests/test-manifest-merging.out --- a/tests/test-manifest-merging.out +++ b/tests/test-manifest-merging.out @@ -8,13 +8,6 @@ adding beta % 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