log tests/test-merge2 @ 480:430a10669928

age author description
Tue, 21 Jun 2005 18:51:06 -0800 mpm Pick up tests from previous patch