tests/test-merge-default.out
changeset 6336 4b0c9c674707
parent 5242 9cd6578750b9
child 6723 1fe6f365df2e
--- a/tests/test-merge-default.out	Fri Mar 21 00:55:53 2008 +0100
+++ b/tests/test-merge-default.out	Fri Mar 21 11:06:02 2008 +0100
@@ -1,6 +1,8 @@
 adding a
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+created new head
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+created new head
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % should fail because not at a head
 abort: repo has 3 heads - please merge with an explicit rev