log tests/test-tags.out @ 1849:360d0f8d9d6f

age author description
Tue, 23 Aug 2005 02:19:38 -0700 mpm Clean up some merge logic