Flag config files as "to be merged on upgrade"
Approved by: cperciva (implicit)
found in openssh's contrib directory. This version has more features and is better written. I intend to submit this upstream as well. Reviewed by: bapt Reviewed by: des Approved by: cperciva MFC after: 1 week