log tests/test-conflict @ 392:ee4c80d294e5

age author description
Fri, 17 Jun 2005 08:50:55 -0800 mpm Tidy up conflict and pull tests