cvswrappers for text files with no merging allowed

[David Everly]

I'm struggling to know what to put in cvswrappers:

I have text files, but they should never be merged.  Should I then
use

* -k 'o' -m 'COPY'

or should I use

* -k 'b' -m 'COPY'

and does the -m 'COPY' actually have an effect?

The files have already been checked in, so how do I use cvs admin to
correct the mistake with respect to the "-m 'COPY'"?  cvs admin -m
appears to have a different meaning.

Thanks,
Dave.