log tests/test-merge2.out @ 743:b0ba1866d6b5

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