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

[Torsten Martinsen]

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