[cvsnt] Re: Merging with keyword substitution

[Mike Lehmann]

> If you specify -kk during the merge

Didn't you wrote some time ago (sorry, cannot find it), that this is not 
necessary with CVSNT because it should be handled by the CVS server 
which already should know about this problem? Doesn't -kk corrupts 
binary files in my project?

--
Mike


Tony Hoyle wrote:
> Mike Lehmann wrote:
> 
>> Hi Tony,
>>
>> To nail it down: if I do not use $Log$, CVSNT 2.0.58d should merge 
>> without causing merge conflicts in other keywords like $Revision$?
>>
>>
> If you specify -kk during the merge it'll catch 99% of it (I'm working 
> on making that default in future versions).
> 
> Tony