Merge ignoring whitespace?

[rickla1]

I know there is a -w option for cvs diff, but for the life of me I 
can't find a way to have cvs update -j pass along or use something 
similar. It seems like there should be a way to do this, and I'm not 
finding it.

I realize an alternative is to hook in and normalize things as they 
go into the repository, but that's not an option at this point. Any 
way to do it as I've indicated? So far I've tried .cvsrc settings for 
diff (but that's not used in  update -j apparently).

Rick