changeset 6512 | 368a4ec603cc |
parent 6336 | 4b0c9c674707 |
child 6646 | 9eb274d773d9 |
--- a/tests/test-merge-remove.out Thu Apr 10 14:25:50 2008 +0200 +++ b/tests/test-merge-remove.out Thu Apr 10 15:02:24 2008 -0500 @@ -1,5 +1,5 @@ created new head -merging foo1 and foo +merging foo1 and foo to foo1 1 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) n 0 -2 bar