Auto Merge

[Ayers, Douglas D (SAIC)]

Hi,

I am currently using Win CVS as the client to a CVS server located on a
Linux Machine.  I would like to turn off the auto merge feature of CVS when
I do an "update".  It would be much easier for me if CVS showed me which of
the files I modified had been edited by others.  I could then use WinMerge
to merge the files easily instead of having to deal with a file full of diff
markers.


Thanks,

Doug