[cvsnt] Re: CVS diff behaves strangely? Merge not fluent?

Torsten Martinsen torsten at tiscali.dk
Thu Feb 6 19:26:37 GMT 2003


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.


Tony Hoyle wrote:

>On Thu, 6 Feb 2003 10:19:25 +0100, "Koen" <no at ssppaamm.com> wrote:
>  
>
>>The problem is that if you want to use a tool like conflicteditor to easily
>>merge the differences, it doesn't work, because it uses the diffs generated
>>    
>>
>
>Bug in conflicteditor I guess.  The diff is the standard diff code
>used in all GNU tools for about the last 10 years.
>
I concur. The CVS Conflict Editor is not exactly the most brilliant 
piece of software around (the TortoiseCVS team has just dropped it in 
favour of another solution).

-Torsten


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