log tests/test-merge2.out @ 680:4b7b79d2db2c

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