Date: Tue, 27 Jul 2010 21:01:13 +0400 From: Anonymous <swell.k@gmail.com> To: zaxis <z_axis@163.com> Cc: freebsd-questions@freebsd.org Subject: Re: I donot like using mergemaster ? Message-ID: <86vd8097vq.fsf@gmail.com> In-Reply-To: <20100727123140.GA5410@orange.esperance-linux.co.uk> (Frank Shute's message of "Tue, 27 Jul 2010 13:31:40 %2B0100") 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>
next in thread | previous in thread | raw e-mail | index | archive | help
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.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?86vd8097vq.fsf>