Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 28 Jan 1999 09:31:05 -0500
From:      "Louis A. Mamakos" <louie@TransSys.COM>
To:        "Matthew D. Fuller" <fullermd@futuresouth.com>
Cc:        Gregory Bond <gnb@itga.com.au>, Chris Knight <fbsd-stb@ghostwheel.com>, freebsd-stable@FreeBSD.ORG
Subject:   Re: mergemaster rocks! 
Message-ID:  <199901281431.JAA30813@whizzo.transsys.com>
In-Reply-To: Your message of "Thu, 28 Jan 1999 02:49:20 CST." <19990128024920.C16540@futuresouth.com> 
References:  <199901280812.TAA29221@lightning.itga.com.au>  <19990128024920.C16540@futuresouth.com>

next in thread | previous in thread | raw e-mail | index | archive | help
> 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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199901281431.JAA30813>