tests/test-merge4.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Mon, 27 Nov 2006 22:22:44 +0100
changeset 3713 8ae88ed2a3b6
parent 2175 b2ae81a7df29
permissions -rw-r--r--
don't create the .hg/data at init time

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)