log tests/test-merge6 @ 3898:316cd5b0c940

age author description
Thu, 30 Nov 2006 22:38:48 -0600 Matt Mackall make manifest friendlier