cvs_merge_file
cvs_merge_file(cf, (cvs_join_rev1 == NULL));
void cvs_merge_file(struct cvs_file *, int);