test-convert-cvs-detectmerge.t #1