--- a/tests/test-merge6.out Wed Aug 24 19:16:45 2005 -0700
+++ b/tests/test-merge6.out Wed Aug 24 19:19:35 2005 -0700
@@ -3,7 +3,7 @@
adding changesets
adding manifests
adding file changes
-added 1 changesets with 1 changes to 1 files
+added 1 changesets with 1 changes to 1 files (+1 heads)
(run 'hg update' to get a working copy)
bar should remain deleted.
f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo
@@ -12,7 +12,7 @@
adding changesets
adding manifests
adding file changes
-added 1 changesets with 0 changes to 0 files
+added 1 changesets with 0 changes to 0 files (+1 heads)
(run 'hg update' to get a working copy)
bar should remain deleted.
f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo