ID: 7214 Fixed in:
Issue Date: 2017-10-31 14:51 AEST Owner:  CVS Support
Last Modified:  2017-10-31 15:52 AESTReporter:  Arthur Barrett
Current Est.  0.0 hours % Complete:  0.0  
Status:NEW / Severity:normal

Affected:  2.8.01
Description:  cvsnt server: warning: file `doc/cvs.dbk' seems to still contain conflict indicators

Actions:    
2017-10-31 14:51 AEST by Arthur Barrett - Just merged suite 2009 into suite 2010 branch (see bug 6856) and I see this 
warning on commit (even though all the conflict markers have been 
fixed/removed):


cvsnt server: warning: file `doc/cvs.dbk' seems to still contain conflict 
indicators
 
2017-10-31 14:52 AEST by Arthur Barrett - Created an attachment (id=3187)
file giving warning


     Query page