diff tests/test-conflict @ 3986:f921bcba405d

Make test-manifest-merging less likely to delete the whole filesystem
author Brendan Cully <brendan@kublai.com>
date Fri, 22 Dec 2006 16:29:35 -0800
parents e506c14382fd
children 46280c004f22
line wrap: on
line diff