[cvsnt] Merging Files and Diffs?

[Trevor Leybourne]

Hi all,

CVSNT performs an automatic merge of text files when it thinks it can do it 
sucessfully, correct?

So, a couple of questions if I may:

1. If there are other changes that do conflict, does it still merge the 
things it thinks it can and then report what it cant? (ie: therefore in 
WinMerge you only see the things that CVS couldn't merge)
2. Or does it call the merge application with the 2 different and unmodified 
files? (ie: In WinMerge you see ALL differences and CVSNT will not have 
merged anything automatically)
3. Can automatic merging be switched off?

I am asking because one of our development teams is complaining that lines 
of code are disappearing when merging is occuring. We are using Visual 
Studio and a developer worked on a form which automatically generated some 
code in a c# file. This was commited. Another developer modified it as well 
and when the code was merged, some lines of generated code were not shown in 
either of the WinMerge panels.

Regards,
Trevor