tests/test-double-merge.out

--- a/tests/test-double-merge.out	Thu May 14 15:48:47 2009 +0200
+++ b/tests/test-double-merge.out	Thu May 14 16:03:17 2009 +0200
@@ -1,4 +1,14 @@
 created new head
+changeset:   0:310fd17130da
+user:        test
+date:        Mon Jan 12 13:46:40 1970 +0000
+summary:     add foo
+
+changeset:   1:7731dad1c2b9
+user:        test
+date:        Mon Jan 12 13:46:40 1970 +0000
+summary:     cp foo bar; change both
+
 resolving manifests
  overwrite None partial False
  ancestor 310fd17130da local 2092631ce82b+ remote 7731dad1c2b9