view tests/test-merge2.out @ 1488:08c7851969cc

only files in normal state should be marked as deleted fix a traceback when you removed an added file
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Wed, 02 Nov 2005 16:08:48 -0800
parents 5a034646e472
children b2ae81a7df29
line wrap: on
line source

adding b
adding b