[cvsnt] Re: Merging Files and Diffs?

Gerhard Fiedler lists at connectionbrazil.com
Wed Jul 27 14:24:51 BST 2005


Community technical support mailing list was retired 2010 and replaced with a professional technical support team. For assistance please contact: Pre-sales Technical support via email to sales@march-hare.com.


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



More information about the cvsnt mailing list
Download the latest CVSNT, TortosieCVS, WinCVS etc. for Windows 8 etc.
@CVSNT on Twitter   CVSNT on Facebook