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

[David Hauck]

Hi Tony,

> #38     Automatic -kk in merging only affects half of the merge.

Can you please elaborate on what the fix is for this? Is this just a
correction to the merge doing a better job of handling conflicts in
$Header$/$Id$ et al without having to specify -kk in the update command? Or
does this require specifying -kk in the update (and if so, does the binary
file merge problems associated with -kk still exist?)?

Thanks, -David