--- a/tests/test-merge7.out	Tue Aug 22 19:12:09 2006 -0500
+++ b/tests/test-merge7.out	Tue Aug 22 19:32:16 2006 -0500
@@ -23,7 +23,7 @@
 merge: warning: conflicts during merge
 resolving manifests
  overwrite None branchmerge True partial False linear False
- ancestor 055d847dd401 local 2eded9ab0a5c remote 84cf5750dd20
+ ancestor 451c744aabcc local a070d41e8360 remote faaea63e63a9
  test.txt versions differ, resolve
 merging test.txt
 resolving test.txt