log tests/test-convert-cvs-detectmerge.out @ 8170:6c4fdde87f90

age author description
Sun, 19 Apr 2009 12:20:39 -0400 Greg Ward cvsps: add test for merge detection (issue1615).