tests/test-merge4.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Tue, 26 Dec 2006 00:40:28 +0100
changeset 3968 033082ba1d1a
parent 2175 b2ae81a7df29
permissions -rw-r--r--
archival.py: use contexts

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)