tests/test-merge4.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Sun, 24 Jan 2010 18:44:12 +0100
changeset 10280 21b3346ce3c7
parent 6336 4b0c9c674707
permissions -rw-r--r--
merge with stable

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