From owner-freebsd-arch@FreeBSD.ORG  Fri Sep 17 22:37:27 2004
Return-Path: <owner-freebsd-arch@FreeBSD.ORG>
Delivered-To: freebsd-arch@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 1509A16A516
	for <freebsd-arch@freebsd.org>; Fri, 17 Sep 2004 22:37:26 +0000 (GMT)
Received: from mail.broadpark.no (mail.broadpark.no [217.13.4.2])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 0CE9243D41
	for <freebsd-arch@freebsd.org>; Fri, 17 Sep 2004 22:37:26 +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 6105E4496; Sat, 18 Sep 2004 00:38:05 +0200 (MEST)
Received: by dwp.des.no (Postfix, from userid 2602)
	id D27B9B85E; Sat, 18 Sep 2004 00:37:24 +0200 (CEST)
To: Ben Mesander <ben@timing.com>
References: <16715.4611.108597.354107@piglet.timing.com>
	<p06110428bd70ee3b2bfa@[128.113.24.47]>
	<414B40B0.5030809@sitetronics.com>
	<16715.25678.610402.410860@piglet.timing.com>
From: des@des.no (=?iso-8859-1?q?Dag-Erling_Sm=F8rgrav?=)
Date: Sat, 18 Sep 2004 00:37:24 +0200
In-Reply-To: <16715.25678.610402.410860@piglet.timing.com> (Ben Mesander's
 message of "Fri, 17 Sep 2004 16:25:18 -0600")
Message-ID: <xzpsm9g8qu3.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: freebsd-arch@freebsd.org
Subject: Re: diff(1)
X-BeenThere: freebsd-arch@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: Discussion related to FreeBSD architecture
	<freebsd-arch.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-arch>,
	<mailto:freebsd-arch-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-arch>
List-Post: <mailto:freebsd-arch@freebsd.org>
List-Help: <mailto:freebsd-arch-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-arch>,
	<mailto:freebsd-arch-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 17 Sep 2004 22:37:28 -0000

Ben Mesander <ben@timing.com> writes:
> I'm a long time UNIX user and have never used sdiff, but I suppose
> it's more than likely that everyone else on this mailing list uses
> it every day (some law about the perversity of the universe tending
> towards a maximum).

mergemaster(8) uses sdiff(1) to merge modified files.

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