From owner-freebsd-current@FreeBSD.ORG  Tue Aug 31 08:36:11 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 AFABD16A4CE; Tue, 31 Aug 2004 08:36:11 +0000 (GMT)
Received: from mail.broadpark.no (mail.broadpark.no [217.13.4.2])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 47D0243D62; Tue, 31 Aug 2004 08:36:11 +0000 (GMT)
	(envelope-from des@des.no)
Received: from dwp.des.no (37.80-203-228.nextgentel.com [80.203.228.37])
	by mail.broadpark.no (Postfix) with ESMTP
	id AC76B454A; Tue, 31 Aug 2004 10:36:48 +0200 (MEST)
Received: by dwp.des.no (Postfix, from userid 2602)
	id 37A34B874; Tue, 31 Aug 2004 10:36:10 +0200 (CEST)
To: David O'Brien <obrien@freebsd.org>
References: <20040829213449.GA33843@hub.freebsd.org>
	<20040830135311.11040.qmail@web50603.mail.yahoo.com>
	<20040830163106.GA19044@dragon.nuxi.com>
	<20040830210817.GB749@galgenberg.net>
From: des@des.no (=?iso-8859-1?q?Dag-Erling_Sm=F8rgrav?=)
Date: Tue, 31 Aug 2004 10:36:10 +0200
In-Reply-To: <20040830210817.GB749@galgenberg.net> (Ulrich Spoerlein's
 message of "Mon, 30 Aug 2004 23:08:17 +0200")
Message-ID: <xzpu0uj901x.fsf@dwp.des.no>
User-Agent: Gnus/5.1006 (Gnus v5.10.6) Emacs/21.3 (berkeley-unix)
MIME-Version: 1.0
Content-Type: text/plain; charset=iso-8859-1
Content-Transfer-Encoding: quoted-printable
cc: Kenneth Stailey <kstailey@yahoo.com>
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 08:36:11 -0000

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.

DES
--=20
Dag-Erling Sm=F8rgrav - des@des.no