tests/test-merge4.out
author Brendan Cully <brendan@kublai.com>
Fri, 22 Dec 2006 16:29:35 -0800
changeset 3953 a8eb050c6489
parent 2175 b2ae81a7df29
permissions -rw-r--r--
Make test-manifest-merging less likely to delete the whole filesystem

0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)