tests/test-merge3.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Wed, 02 Nov 2005 16:08:48 -0800
changeset 1488 08c7851969cc
parent 925 5a034646e472
child 1747 91c56c427171
permissions -rw-r--r--
only files in normal state should be marked as deleted fix a traceback when you removed an added file

removing b
b never committed!
nothing changed