[cvsnt] Conflict text customisation

Glen Starrett grstarrett at cox.net
Fri Oct 24 00:18:52 BST 2003


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.


> FYI, TortoiseCVS no longer uses the CVS Conflict Editor - instead we 
> parse the conflict file and invoke a standard diff/merge tool 
> allowing 
> the user to easily see the conflicting lines side-by-side.

And It's a Very Good Thing, too!  

TortoiseCVS rocks :)

Glen Starrett




More information about the cvsnt mailing list
Download the latest CVSNT, TortosieCVS, WinCVS etc. for Windows 8 etc.
@CVSNT on Twitter   CVSNT on Facebook