Mergemaster question

[Carl Morley]

# -----Original Message-----
# From: owner-freebsd-questions at freebsd.org [mailto:owner-freebsd-
# questions at freebsd.org] On Behalf Of Forrest Aldrich
# Sent: Monday, 7 April 2003 17:06
# To: freebsd-questions at freebsd.org
# Subject: Mergemaster question
# 
# There are certain config files that I don't really want mergemaster to
# request changing, like /etc/hosts.allow, /etc/namedb/named.conf, and
# others.  Is there a way to configure this so that it won't touch
certain
# files, ever.  If not, it seems like a reasonable feature to have ?
# 
# _______________________________________________
# freebsd-questions at freebsd.org mailing list
# http://lists.freebsd.org/mailman/listinfo/freebsd-questions
# To unsubscribe, send any mail to "freebsd-questions-
# unsubscribe at freebsd.org"

When you run mergemaster, you get to choose which version of a
particular file you want to keep, or you can merge them on a
diff-by-diff basis.  That would seem to be all the features you're
after.