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.
David Hauck wrote: > 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 Pretty much. It now does the -kk for both files in the merge not just one of them. > does this require specifying -kk in the update (and if so, does the binary > file merge problems associated with -kk still exist?)? You could always do -k-v to avoid those anyway. Tony