tests/test-merge7.out

--- a/tests/test-merge7.out	Sun Sep 17 17:07:44 2006 -0500
+++ b/tests/test-merge7.out	Sun Sep 17 17:13:02 2006 -0500
@@ -22,7 +22,7 @@
 (run 'hg heads' to see heads, 'hg merge' to merge)
 merge: warning: conflicts during merge
 resolving manifests
- overwrite None branchmerge True partial False linear False
+ overwrite None branchmerge True partial False
  ancestor 451c744aabcc local a070d41e8360 remote faaea63e63a9
  test.txt versions differ, resolve
 merging test.txt