diff tests/test-merge6.out @ 3987:c6f10448278f

test-manifest-merging: we only need to remove files
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Sun, 24 Dec 2006 22:28:01 +0100
parents b2ae81a7df29
children 8feb33c2d153
line wrap: on
line diff