log tests/test-merge2.out @ 679:c11e9a6777ae

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