(cvs-parse-status): Handle the "used to have a conflict" marker.
Attach a file by drag & drop or click to upload
