--- a/tests/test-merge9.out Fri Mar 21 00:55:53 2008 +0100 +++ b/tests/test-merge9.out Fri Mar 21 11:06:02 2008 +0100 @@ -2,6 +2,7 @@ adding foo adding quux1 adding quux2 +created new head merging bar merging bar failed! merging foo and baz