merge algorithm failed on several files, and the translation of the mrouted man page to mdoc didn't help...
that is conflicting with cvs-1.6's "cvs update -A" when run from freefall's update jobs.
I had moved them out of the way.