Put only the filenames into the cvs-merge-conflicts file, so that
vi `cat cvs-merge-conflicts` works.