From owner-freebsd-current@FreeBSD.ORG  Tue Aug 31 19:49:55 2004
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
Delivered-To: freebsd-current@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 8428E16A4CE
	for <freebsd-current@freebsd.org>;
	Tue, 31 Aug 2004 19:49:55 +0000 (GMT)
Received: from smtpout.mac.com (smtpout.mac.com [17.250.248.97])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 4F9AE43D2D
	for <freebsd-current@freebsd.org>;
	Tue, 31 Aug 2004 19:49:53 +0000 (GMT)	(envelope-from cswiger@mac.com)
Received: from mac.com (smtpin07-en2 [10.13.10.152])
	by smtpout.mac.com (Xserve/MantshX 2.0) with ESMTP id i7VJnoJd008282;
	Tue, 31 Aug 2004 12:49:50 -0700 (PDT)
Received: from [192.168.1.6] (pool-68-160-193-218.ny325.east.verizon.net
	[68.160.193.218])	(authenticated bits=0)i7VJnSWd022597;
	Tue, 31 Aug 2004 12:49:35 -0700 (PDT)
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>
Mime-Version: 1.0 (Apple Message framework v619)
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Message-Id: <DE9F7CE6-FB86-11D8-B6F3-003065A20588@mac.com>
Content-Transfer-Encoding: quoted-printable
From: Charles Swiger <cswiger@mac.com>
Date: Tue, 31 Aug 2004 15:49:28 -0400
To: des@des.no (=?ISO-8859-1?Q?Dag-Erling_Sm=F8rgrav?=)
X-Mailer: Apple Mail (2.619)
cc: freebsd-current@freebsd.org
Subject: Re: suggestion for /usr/src/UPDATING
X-BeenThere: freebsd-current@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: Discussions about the use of FreeBSD-current
	<freebsd-current.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-current>
List-Post: <mailto:freebsd-current@freebsd.org>
List-Help: <mailto:freebsd-current-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 31 Aug 2004 19:49:55 -0000

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