Annette Waters wrote:

>
>Is there a way to tell cvs to ignore conflicts that consist of extra 
spaces,
>etc?
>

You can use "cvs diff -b" and it won't display differences in 
whitespace.  This won't help you if you are doing a merge, though.

-- 
Stephen Rasku                   E-mail: [EMAIL PROTECTED]
Senior Software Engineer        Web:    http://www.pop-star.net/
TGI Technologies


_______________________________________________
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs

Reply via email to