Date: Tue, 27 Jul 2010 21:09:59 +0100 From: Frank Shute <frank@shute.org.uk> To: Anonymous <swell.k@gmail.com> Cc: freebsd-questions@freebsd.org Subject: Re: I donot like using mergemaster ? Message-ID: <20100727200959.GB6718@orange.esperance-linux.co.uk> In-Reply-To: <86vd8097vq.fsf@gmail.com> References: <29262747.post@talk.nabble.com> <201007260917.32632.jmc-freebsd2@milibyte.co.uk> <29272211.post@talk.nabble.com> <20100727123140.GA5410@orange.esperance-linux.co.uk> <86vd8097vq.fsf@gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On Tue, Jul 27, 2010 at 09:01:13PM +0400, Anonymous wrote: > > Frank Shute <frank@shute.org.uk> writes: > > > On Mon, Jul 26, 2010 at 06:18:22PM -0700, zaxis wrote: > >> > >> > >> that's great ! I will use /etc/mergemaster.rc to upgrade my FB 8.0. > >> > > > > You might also want to put this line in mergemaster.rc: > > > > DIFF_OPTIONS='-I$FreeBSD:.*[$]' > > I think it's already done by FREEBSD_ID (-F) in rc file. Thanks for pointing that out. Also made me notice a bug in the mergemaster manpage which I'll write a patch and pr for. Regards, -- Frank Contact info: http://www.shute.org.uk/misc/contact.html
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20100727200959.GB6718>