Peter TB Brett wrote:

> I'm therefore going to start removing $Log$ keywords from all files.
>
> Although $Header$ keywords cause similar problems, they turned out to
> be much easier to deal with, because the conflict's restricted to a
> single line.

If you want chapter and verse on how the $Log$ keyword is dangerous:

http://ximbiot.com/cvs/manual/cvs-1.11.20/cvs_12.html#SEC102

Peter

--
Quake II build tools: http://peter-b.co.uk/
Latest QuArK: http://quark.sourceforge.net/LatestVersion

v2sw6YShw7ln5pr6ck3ma8u7Lw3+2m0l7CFi6e4+8t4Eb8Aen4g6Pa2Xs5MSr5p4
hackerkey.com