Date: Tue, 31 Aug 2004 10:36:10 +0200 From: des@des.no (=?iso-8859-1?q?Dag-Erling_Sm=F8rgrav?=) To: David O'Brien <obrien@freebsd.org> Cc: freebsd-current@freebsd.org Subject: Re: suggestion for /usr/src/UPDATING Message-ID: <xzpu0uj901x.fsf@dwp.des.no> In-Reply-To: <20040830210817.GB749@galgenberg.net> (Ulrich Spoerlein's message of "Mon, 30 Aug 2004 23:08:17 %2B0200") References: <20040829213449.GA33843@hub.freebsd.org> <20040830135311.11040.qmail@web50603.mail.yahoo.com> <20040830163106.GA19044@dragon.nuxi.com> <20040830210817.GB749@galgenberg.net>
next in thread | previous in thread | raw e-mail | index | archive | help
Ulrich Spoerlein <q@uni.de> writes: > On Mon, 30.08.2004 at 09:31:06 -0700, David O'Brien wrote: > > Note, though, that this output has nothing to do with mergemaster -- it > > is sdiff(1) that is used. What you don't like is sdiff(1)'s output > > format. > Looks like one can't configure the used keys... Feel free to submit a patch. DES --=20 Dag-Erling Sm=F8rgrav - des@des.no
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?xzpu0uj901x.fsf>