--- a/tests/test-double-merge.out Fri Mar 21 00:55:53 2008 +0100
+++ b/tests/test-double-merge.out Fri Mar 21 11:06:02 2008 +0100
@@ -1,3 +1,4 @@
+created new head
resolving manifests
overwrite None partial False
ancestor 310fd17130da local 2092631ce82b+ remote 7731dad1c2b9