diff hgmerge @ 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 6a03cff2b0f5
children e4480f2b61e9
line wrap: on
line diff