tests/test-merge2.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Tue, 25 Oct 2005 15:51:28 -0700
changeset 1447 508a3f559553
parent 925 5a034646e472
child 2175 b2ae81a7df29
permissions -rw-r--r--
revert added and removed files to their normal state before reverting add a test for revert

adding b
adding b