tests/test-merge4.out
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Wed, 07 Mar 2007 15:25:58 -0300
changeset 4159 a896607d3ec3
parent 2175 b2ae81a7df29
permissions -rw-r--r--
fix manifest.find

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)