[cvsnt] ticket #38 (-kk in merge)

[Tony Hoyle]

David Hauck wrote:

> I'd seen problems with binary file merges previously if I specified -kk in
> the above line (which worked great for eliminating keyword merge conflicts
> in 2.0.58d). Are you suggesting my new command should be:
> 
> cvs -q up -k-v -j V1_0_0 -j V1_0_1
>
Yes (that command basically means subtract the 'v' from all files, which 
does nothing to a binary file and turns a text file into -kk).

The -k- and -k+ options might be in 2.0.58d.. they're around the right 
time but might have missed that release.

Tony