Re: Problem with documentation in CVS version

On Monday 20 February 2006 04:25 pm, Raymond Martin wrote:
> The offending documentation is in lush-intro.hlp
> Either merging was incorrectly done or some syntax in the file must be in conflict 
> with CVS operations that results in merge/diff marks being inserted (which
> won't work in helptool, of course).

My copy of the file is fine.
Sometimes cvs mixes things up in the working directories.
Try removing it before doing a cvs update.
- L.


-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems?  Stop!  Download the new AJAX search engine that makes
searching your log files as easy as surfing the  web.  DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642