log tests/test-merge2.out @ 474:b2ae8283d1a6

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