Date: Wed, 14 Feb 2001 08:42:26 -0700 (MST) From: John Reynolds~ <jreynold@sedona.ch.intel.com> To: freebsd-stable@freebsd.org Subject: Re: sshd in 4.2-STABLE Message-ID: <14986.42850.626368.28696@hip186.ch.intel.com> In-Reply-To: <20010213192504.A61478@mollari.cthul.hu> References: <20010213112727.C56175@mollari.cthul.hu> <Pine.BSF.4.31.0102131320500.863-100000@localhost> <20010213192504.A61478@mollari.cthul.hu>
next in thread | previous in thread | raw e-mail | index | archive | help
[ On Tuesday, February 13, Kris Kennaway wrote: ] > > Actually, I think I was wrong (I was thinking of the option to merge > based on diffs). Still, talk to Doug about the suggestion. > > Kris I have a local hack to mergemaster which goes in an removes certain files from the "tmproot" that I don't want mergemaster to screw with (named.conf, sendmail.cf, passwd, to name a few). I suppose you could do the same thing using the MM_PRE_COMPARE_SCRIPT variable--point that at a script which pre-nuked certain files. I meant to play with it last night, but got distracted with the Real World(tm) (not the MTV series ;-). -Jr -- =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= | John Reynolds WCCG, CCE, Higher Levels of Abstraction | | Intel Corporation MS: CH6-210 Phone: 480-554-9092 pgr: 602-868-6512 | | jreynold@sedona.ch.intel.com http://www-aec.ch.intel.com/~jreynold/ | =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= 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?14986.42850.626368.28696>