| changeset 6336 | 4b0c9c674707 |
| parent 2175 | b2ae81a7df29 |
--- a/tests/test-merge2.out Fri Mar 21 00:55:53 2008 +0100 +++ b/tests/test-merge2.out Fri Mar 21 11:06:02 2008 +0100 @@ -1,5 +1,8 @@ 0 files updated, 0 files merged, 0 files removed, 0 files unresolved +created new head 0 files updated, 0 files merged, 0 files removed, 0 files unresolved adding b +created new head 0 files updated, 0 files merged, 0 files removed, 0 files unresolved adding b +created new head