diff --git a/tests/test-flags.out b/tests/test-flags.out
--- a/tests/test-flags.out
+++ b/tests/test-flags.out
@@ -14,9 +14,9 @@ searching for changes
 adding changesets
 adding manifests
 adding file changes
-added 1 changesets with 1 changes to 1 files (+1 heads)
+added 1 changesets with 0 changes to 0 files (+1 heads)
 (run 'hg heads' to see heads, 'hg merge' to merge)
-changeset:   2:b833d578451e
+changeset:   2:37dccb76c058
 tag:         tip
 parent:      0:4536b1c2ca69
 user:        test
@@ -28,7 +28,7 @@ user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     a updated
 
-changeset:   2:b833d578451e
+changeset:   2:37dccb76c058
 tag:         tip
 parent:      0:4536b1c2ca69
 user:        test
@@ -46,17 +46,16 @@ date:        Mon Jan 12 13:46:40 1970 +0
 summary:     added a b
 
 resolving manifests
-merging a
-0 files updated, 1 files merged, 0 files removed, 0 files unresolved
+0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 pulling from ../test2
 searching for changes
 adding changesets
 adding manifests
 adding file changes
-added 1 changesets with 1 changes to 1 files (+1 heads)
+added 1 changesets with 0 changes to 0 files (+1 heads)
 (run 'hg heads' to see heads, 'hg merge' to merge)
-changeset:   2:b833d578451e
+changeset:   2:37dccb76c058
 tag:         tip
 parent:      0:4536b1c2ca69
 user:        test
@@ -68,7 +67,7 @@ user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     b updated
 
-changeset:   2:b833d578451e
+changeset:   2:37dccb76c058
 tag:         tip
 parent:      0:4536b1c2ca69
 user:        test
@@ -86,19 +85,15 @@ date:        Mon Jan 12 13:46:40 1970 +0
 summary:     added a b
 
 resolving manifests
-getting a
-1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 -rwxr-x---
 -rwxr-x---
 -rwxr-x---
    rev    offset  length   base linkrev nodeid       p1           p2
      0         0       0      0       0 b80de5d13875 000000000000 000000000000
-     1         0       0      0       2 37c42bd6cc03 b80de5d13875 000000000000
    rev    offset  length   base linkrev nodeid       p1           p2
      0         0       0      0       0 b80de5d13875 000000000000 000000000000
-     1         0       0      0       1 37c42bd6cc03 b80de5d13875 000000000000
    rev    offset  length   base linkrev nodeid       p1           p2
      0         0       0      0       0 b80de5d13875 000000000000 000000000000
      1         0       5      1       1 7fe919cc0336 b80de5d13875 000000000000
-     2         5       0      2       2 37c42bd6cc03 b80de5d13875 000000000000