[cvsnt] Re: Merging Files and Diffs?

[Gerhard Fiedler]

Trevor Leybourne wrote:

> 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)

It seems you might be confusing cvsnt (the command line client application)
with the GUI integration that you are using that works on top of it. It
helps a lot understanding where the boundaries between these two parts are,
as it allows you to separate the cvsnt problems from the GUI integration
problems.

Gerhard