[cvsnt] wincvs merging

[douglass_davis at earthlink.net]

I am trying to do something which is probably pretty simple, but 
honestly, I don't really understand the documentation as far as how I am 
supposed to do it.

I use wincvs.  I have  a few files with branches.  I am also importing 
3rd party sources.  What I would like to do is merge the one i have been 
working on (1.2) with the new source i just downloaded (1.1.1.2).  
Because right now, I can't see the changes from the new source that i 
downloaded.

You can see the picture of the revisions here:  
http://home.earthlink.net/~douglass_davis/cvs-screen.gif

Also, does that little symbol on the revision in the picture mean that 
is the head revision?

I am still trying to figure out CVS, so i would appreciate any help you give. Thanks.