log tests/test-merge2.out @ 610:4c02464cb9f0

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