suggestion for /usr/src/UPDATING
cswiger at mac.com
Tue Aug 31 12:49:55 PDT 2004
On Aug 31, 2004, at 4:36 AM, Dag-Erling Smørgrav wrote:
> Ulrich Spoerlein <q at 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 --
>>> is sdiff(1) that is used. What you don't like is sdiff(1)'s output
>> 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.
More information about the freebsd-current