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.
CVSROOT: /usr/local/cvs Module name: cvsnt Repository: cvsnt/src/ Changes by: tmh at betty.magenta-netlogic.com. 03/01/22 17:03:55 Modified files: cvsnt/src/: Tag: CVSNT_1_11_1_3_REL update.c Log message: If file is created on other branch as well as ours and we're just doing a straight merge, treat it as a delta from an imaginary empty file, since it's quite likely that it's actually the same (or at least very similar). Standard conflict resolution can cope with the problem of two completely different files with the same name.