Date: Mon, 7 Apr 2003 17:10:23 +1000 From: "Carl Morley" <bsdmn@webize.com.au> To: "'Forrest Aldrich'" <forrie@forrie.com>, <freebsd-questions@freebsd.org> Subject: RE: Mergemaster question Message-ID: <000101c2fcd4$c1c0a790$0a64a8c0@webizepc> In-Reply-To: <5.2.1.1.2.20030407030418.0123d018@192.168.1.1>
next in thread | previous in thread | raw e-mail | index | archive | help
# -----Original Message----- # From: owner-freebsd-questions@freebsd.org [mailto:owner-freebsd- # questions@freebsd.org] On Behalf Of Forrest Aldrich # Sent: Monday, 7 April 2003 17:06 # To: freebsd-questions@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@freebsd.org mailing list # http://lists.freebsd.org/mailman/listinfo/freebsd-questions # To unsubscribe, send any mail to "freebsd-questions- # unsubscribe@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.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?000101c2fcd4$c1c0a790$0a64a8c0>