suggestion for /usr/src/UPDATING

Brooks Davis brooks at
Tue Aug 31 12:53:22 PDT 2004

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 at> 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:
> ...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
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url :

More information about the freebsd-current mailing list