[cvsnt] Conflict text customisation

Tony Hoyle tmh at nodomain.org
Thu Oct 23 12:23:33 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.


On Thu, 23 Oct 2003 12:13:17 +0100, "James Wilkinson"
<james at kudosdigital.com> wrote:

>Yes, what, or where, is an 'Automated Conflict Parser' ?
>
The only one I've used is CVS Conflict Editor:
http://sourceforge.net/projects/conflicteditor/

IIRC if you update using Tortoise it automatically invokes it on files
that have conflicts.

Tony



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