tests/test-merge4.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Mon, 19 Jun 2006 20:37:36 +0200
changeset 2459 5c5277f03887
parent 2175 b2ae81a7df29
child 6336 4b0c9c674707
permissions -rw-r--r--
merge with crew

0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)