Date: Tue, 13 Feb 2001 13:26:39 -0800 (PST) From: Brian Behlendorf <brian@collab.net> To: Kris Kennaway <kris@obsecurity.org> Cc: Greg Troxel <gdt@fnord.ir.bbn.com>, <freebsd-stable@FreeBSD.ORG> Subject: Re: sshd in 4.2-STABLE Message-ID: <Pine.BSF.4.31.0102131320500.863-100000@localhost> In-Reply-To: <20010213112727.C56175@mollari.cthul.hu>
next in thread | previous in thread | raw e-mail | index | archive | help
On Tue, 13 Feb 2001, Kris Kennaway wrote: > On Tue, Feb 13, 2001 at 08:10:19AM -0800, Brian Behlendorf wrote: > > I have to agree - many of the changes mergemaster makes are to files that > > no one would recommend editing directly in regular use, like MAKEDEV and > > /etc/rc.network and all the stuff in /etc/defaults. Modifying mergemaster > > to only ask to merge files that have been changed sounds like a good idea > > to me... > > Have you read the mergemaster docs? It can already do this. Er, how? You mean the MM_PRE_COMPARE_SCRIPT and MM_EXIT_SCRIPT script hooks? It's been a long week and is only Tuesday, but I must be missing something... Brian To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-stable" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?Pine.BSF.4.31.0102131320500.863-100000>