log tests/test-merge2 @ 491:66eb9905d0a2

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