diff -r e29557d687c9 -r 4b0c9c674707 tests/test-confused-revert.out --- a/tests/test-confused-revert.out Fri Mar 21 00:55:53 2008 +0100 +++ b/tests/test-confused-revert.out Fri Mar 21 11:06:02 2008 +0100 @@ -8,6 +8,7 @@ ? b 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved +created new head merging a 0 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit)