[Pharo-dev] Merge conflict for "META Case: restructure Tests and test packages"

for example : https://pharo.fogbugz.com/default.asp?14433 I don't why there is a merge conflict, maybe it is how the slice is created. I think the restructuring (moving all classes from XXXTest to XXX-Tests) would work if we delete the empty XXXTests package before creating the slice. nicolai