From owner-freebsd-stable Thu Jan 28 06:31:25 1999 Return-Path: Received: (from majordom@localhost) by hub.freebsd.org (8.8.8/8.8.8) id GAA22871 for freebsd-stable-outgoing; Thu, 28 Jan 1999 06:31:25 -0800 (PST) (envelope-from owner-freebsd-stable@FreeBSD.ORG) Received: from whizzo.transsys.com (whizzo.TransSys.COM [144.202.42.10]) by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id GAA22866 for ; Thu, 28 Jan 1999 06:31:23 -0800 (PST) (envelope-from louie@whizzo.transsys.com) Received: from whizzo.transsys.com (localhost.transsys.com [127.0.0.1]) by whizzo.transsys.com (8.9.2/8.9.1) with ESMTP id JAA30813; Thu, 28 Jan 1999 09:31:05 -0500 (EST) (envelope-from louie@whizzo.transsys.com) Message-Id: <199901281431.JAA30813@whizzo.transsys.com> X-Mailer: exmh version 2.0.2 2/24/98 To: "Matthew D. Fuller" cc: Gregory Bond , Chris Knight , freebsd-stable@FreeBSD.ORG From: "Louis A. Mamakos" Subject: Re: mergemaster rocks! References: <199901280812.TAA29221@lightning.itga.com.au> <19990128024920.C16540@futuresouth.com> In-reply-to: Your message of "Thu, 28 Jan 1999 02:49:20 CST." <19990128024920.C16540@futuresouth.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Thu, 28 Jan 1999 09:31:05 -0500 Sender: owner-freebsd-stable@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG > On Thu, Jan 28, 1999 at 07:12:09PM +1100, a little birdie told me > that Gregory Bond remarked > > > > but I wish there was an option to point out files in the live /etc that weren't > > in the prototype one ... > > > > and that it was smarter dealing with pwd.db and spwd.db > > Having some sort of 'exclude' file it could read would be a nice > addition. master.passwd, *.db, aliases, maybe sendmail.cw, rc.local... > some things you really don't want to mistakenly 'merge'... It would also be nice if you could specify your own replacement for 'sdiff'. I'd much prefer to use ediff mode inside of emacs to do the merging.. I end up doing this by hand after the fact. louie To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-stable" in the body of the message