cvs commit: src/etc hosts.allow
obrien at FreeBSD.org
Thu Aug 31 17:27:59 UTC 2006
On Wed, Aug 30, 2006 at 01:27:59PM +0200, Dag-Erling Smrgrav wrote:
> Ruslan Ermilov <ru at 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 at FreeBSD.org)
More information about the cvs-src