tests/test-merge4.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Tue, 14 Aug 2007 17:20:51 +0200
changeset 5161 24d306834de5
parent 2175 b2ae81a7df29
permissions -rw-r--r--
merge with -stable

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)