[cvsnt] Conflict text customisation

[Peter Crowther]

> From: Tony Hoyle [mailto:tmh at nodomain.org] 
> Putting #error in there will just break
> every language that doesn't use that macro, not to mention all the
> automated CVS conflict parsers.

True, but the original poster may be using Visual Studio only (for
example) and no automated conflict parsers.  On which subject, maybe
it'd be useful to get such a conflict parser going in their environment.
I've never used one; do folks have any recommendations?

		- Peter