RE: how can I see what changes a cvs update would merge

[Robert P. J. Day]

-----Original Message-----
From: Gagneet Singh <address@hidden>
Sent: Nov 28, 2003 9:35 AM
To: "'Robert P. J. Day'" <address@hidden>, 
        'Urs Thuermann' <address@hidden>
Cc: address@hidden
Subject: RE: how can I see what changes a cvs update would merge

cvs diff -wb -i File1.dsp 

And find out what has changed.

----------------------

  ???.  my cvs reference doesn't explain the "-wb" or "-i"
options to "cvs diff".  care to elaborate?

rday