Date: Thu, 31 Aug 2006 10:27:54 -0700 From: "David O'Brien" <obrien@FreeBSD.org> To: Dag-Erling =?unknown-8bit?Q?Sm=F8rgrav?= <des@des.no> Cc: cvs-src@FreeBSD.org, src-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/etc hosts.allow Message-ID: <20060831172754.GB60337@dragon.NUXI.org> In-Reply-To: <86zmdmfoow.fsf@dwp.des.no> References: <200608290920.k7T9KmV9067843@repoman.freebsd.org> <86zmdmfoow.fsf@dwp.des.no>
next in thread | previous in thread | raw e-mail | index | archive | help
On Wed, Aug 30, 2006 at 01:27:59PM +0200, Dag-Erling Smrgrav wrote: > Ruslan Ermilov <ru@FreeBSD.org> writes: > > Modified files: > > etc hosts.allow > > Log: > > Comment out lines that use example addresses and example.com names so > > that local changes can be made more easily (without having to comment > > these lines, and making the diff more readable). > > That reminds me - /etc/hosts is another file that mergemaster often > trips over. What does that mean? In my experience Mergemaster "trips over" every /etc modified file that I haven't locally edited. -- -- David (obrien@FreeBSD.org)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060831172754.GB60337>