Re: cvs update; merge

[Larry Jones]

Jimm Grimm writes:
> 
> > >   Is there any way to get CVS to ignore CRLF conversions, 
> > > yet still do merges?
> > 
> > No.
> 
>       Yes there is - you just showed me how to do it.  It works great -
> Thanks!

I must have misunderstood your question, then.  I thought you were
asking if there was a way to merge binary files, which there isn't. 
What I showed you was a way to tell CVS that all files *except* those
that match "*.txt" are binary.

-Larry Jones

Whatever it is, it's driving me crazy! -- Calvin