viewing conflicts without really doing update -j

[Ronald Petty]

When you do a cvs update -j branch_name, you see all the files in the
module fly by and it tells you whether there is a conflict or whatever. 
Is there a way to do this (see what would happen), without it really
doing it?

Thanks
Ron