Symbol: FILE_MERGE
usr.bin/cvs/commit.c
324
if (cf->file_status == FILE_MERGE ||
usr.bin/cvs/file.c
962
cf->file_status = FILE_MERGE;
usr.bin/cvs/release.c
188
if (cf->file_status == FILE_MERGE ||
usr.bin/cvs/update.c
352
cf->file_status = FILE_MERGE;
usr.bin/cvs/update.c
450
case FILE_MERGE: