changeset 2175 | b2ae81a7df29 |
parent 925 | 5a034646e472 |
child 6336 | 4b0c9c674707 |
--- a/tests/test-merge2.out Mon May 01 19:17:34 2006 +0200 +++ b/tests/test-merge2.out Tue May 02 18:44:02 2006 +0200 @@ -1,2 +1,5 @@ +0 files updated, 0 files merged, 0 files removed, 0 files unresolved +0 files updated, 0 files merged, 0 files removed, 0 files unresolved adding b +0 files updated, 0 files merged, 0 files removed, 0 files unresolved adding b