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.
> Just merger the change, without any "<<<<<<<<<<XXXfile" or "=========="! You can't, and it would only "trash" the file if possibile. CVSNT inserts those "comments" if and only if it is unable to merge the file properly, because it can't properly "synch" the contents. You can have dfm treated like binary files, and CVS will not try to merge them, or you have to merge them manually, sometimes, and it is not always possibile, especially with binary data within a dfm. -- Luigi D. Sandon cp at sandon.it