[cvsnt] Re: Merging with keyword substitution

Tony Hoyle tmh at nodomain.org
Wed Jun 22 11:05:57 BST 2005


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.


Mike Lehmann wrote:
> Hi Tony,
> 
> To nail it down: if I do not use $Log$, CVSNT 2.0.58d should merge 
> without causing merge conflicts in other keywords like $Revision$?
> 
>
If you specify -kk during the merge it'll catch 99% of it (I'm working 
on making that default in future versions).

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