log tests/test-merge6 @ 3736:ad3d5b4367cb

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