Date: Tue, 31 Aug 2004 15:49:28 -0400 From: Charles Swiger <cswiger@mac.com> To: des@des.no (=?ISO-8859-1?Q?Dag-Erling_Sm=F8rgrav?=) Cc: freebsd-current@freebsd.org Subject: Re: suggestion for /usr/src/UPDATING Message-ID: <DE9F7CE6-FB86-11D8-B6F3-003065A20588@mac.com> In-Reply-To: <xzpu0uj901x.fsf@dwp.des.no> References: <20040829213449.GA33843@hub.freebsd.org> <20040830135311.11040.qmail@web50603.mail.yahoo.com> <20040830163106.GA19044@dragon.nuxi.com> <20040830210817.GB749@galgenberg.net> <xzpu0uj901x.fsf@dwp.des.no>
next in thread | previous in thread | raw e-mail | index | archive | help
On Aug 31, 2004, at 4:36 AM, Dag-Erling Sm=F8rgrav wrote: > 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 --=20= >>> 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. OK. Submitted as gnu/71210, diffs to the code are at: http://www.pkix.net/~chuck/sdiff.diff ...since the PR may have space-stuffed tabs. --=20 -Chuck
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?DE9F7CE6-FB86-11D8-B6F3-003065A20588>