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