> Log Message:
> mention `cvs' in the the previous hack so that the clueless get a clue.

For what it's worth, a bunch of different merge tools (probably all
derived from rcsmerge) use the same markers.  i've seen them with:
	- cvs
	- ode		(a "different" rcs front-end used by OSF)
	- teamware	(an sccs wrapper used by sun)

					- Bill