log tests/test-merge7 @ 4200:7ca05d29c1f0

age author description
Fri, 01 Dec 2006 13:34:09 +0100 Benoit Boissinot switch to the .hg/store layout, fix the tests