I don't really recommend that people use mergemaster any more.
make upgrade (which really runs make upgrade_etc from /usr/src/etc)
does a much better job, including removing old files that have been
moved or taken out of the build, and it is entirely automatic.
-Matt