log tests/test-merge1 @ 701:80ed193efff7

age author description
Tue, 21 Jun 2005 21:07:08 -0800 mpm Fix up test-merge1