Date: Tue, 31 Aug 2004 12:53:29 -0700 From: Brooks Davis <brooks@one-eyed-alien.net> To: Charles Swiger <cswiger@mac.com> Cc: freebsd-current@freebsd.org Subject: Re: suggestion for /usr/src/UPDATING Message-ID: <20040831195329.GB21995@odin.ac.hmc.edu> In-Reply-To: <DE9F7CE6-FB86-11D8-B6F3-003065A20588@mac.com> 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> <DE9F7CE6-FB86-11D8-B6F3-003065A20588@mac.com>
index | next in thread | previous in thread | raw e-mail
[-- Attachment #1 --] On Tue, Aug 31, 2004 at 03:49:28PM -0400, Charles Swiger wrote: > On Aug 31, 2004, at 4:36 AM, Dag-Erling Smørgrav 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 -- > >>>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. The environment variable seems like a good idea. Changing the default is a very bad one. My finger memory is just fine with sdiff and a change would suck. -- Brooks -- Any statement of the form "X is the one, true Y" is FALSE. PGP fingerprint 655D 519C 26A7 82E7 2529 9BF0 5D8E 8BE9 F238 1AD4 [-- Attachment #2 --] -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.1 (GNU/Linux) iD8DBQFBNNc4XY6L6fI4GtQRAi4ZAJ4wpeBuoyCoVgzByjtnXz90I46YsgCdErnA k0HKjRFPz+y5wPM0GhsHrBQ= =0k48 -----END PGP SIGNATURE-----help
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040831195329.GB21995>