log tests/test-conflict.out @ 523:003df62ae39f

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