tests/test-add.out
changeset 6336 4b0c9c674707
parent 6004 5af5f0f9d724
child 6518 92ccccb55ba3
--- a/tests/test-add.out	Fri Mar 21 00:55:53 2008 +0100
+++ b/tests/test-add.out	Fri Mar 21 11:06:02 2008 +0100
@@ -13,6 +13,7 @@
 % should fail
 a already tracked!
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+created new head
 merging a
 warning: conflicts during merge.
 merging a failed!