tests/test-merge4.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Sun, 10 Dec 2006 00:06:59 +0100
changeset 3851 8f18e31c4441
parent 2175 b2ae81a7df29
child 6336 4b0c9c674707
permissions -rw-r--r--
add "requires" file to the repo, specifying the requirements

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)