etcmerge is a tool for keeping /etc up to date when updating,
or for management after installworld (instead of mergemester).
The primary difference from mergemaster, is that etcmerge
requires much less manual work than mergemaster, due to the
use of a three way merge.

WWW: http://BSDforge.com/projects/sysutils/etcmerge/