| changeset 11977 | db2a291e25e9 |
| parent 11976 | b28fc3b3efd6 |
| child 11978 | ef4a1ffbf519 |
--- a/tests/test-merge4.out Wed Aug 18 05:09:58 2010 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,4 +0,0 @@ -0 files updated, 0 files merged, 1 files removed, 0 files unresolved -created new head -1 files updated, 0 files merged, 0 files removed, 0 files unresolved -(branch merge, don't forget to commit)