grep File: genv11src.cvsstatus050324.txt > $CASE/gen/ver_11/chgen/mergeConflicts050401: --------------------- saturn.cs.uml.edu(284)> grep File: genv11src.cvsstatus050324.txt 47:File: aareadme Status: Locally Modified 110:File: chgen.c Status: Locally Modified 173:File: gen_defines.c Status: File had conflicts on merge 281:File: gen_pr_load.c Status: File had conflicts on merge 290:File: gen_pr_log.c Status: Locally Modified ----------------------------