From owner-freebsd-arch@FreeBSD.ORG  Sat Sep 18 13:32:54 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 C8EB416A4CE
	for <freebsd-arch@freebsd.org>; Sat, 18 Sep 2004 13:32:54 +0000 (GMT)
Received: from mail-in-01.arcor-online.net (mail-in-02.arcor-online.net
	[151.189.21.42])
	by mx1.FreeBSD.org (Postfix) with ESMTP id D3B3543D1F
	for <freebsd-arch@freebsd.org>; Sat, 18 Sep 2004 13:32:53 +0000 (GMT)
	(envelope-from mailnull@mips.inka.de)
Received: from kemoauc.mips.inka.de (dsl-213-023-057-015.arcor-ip.net
	[213.23.57.15])
	by mail-in-01.arcor-online.net (Postfix) with ESMTP id 340C45B54D
	for <freebsd-arch@freebsd.org>;
	Sat, 18 Sep 2004 15:32:52 +0200 (CEST)
Received: from kemoauc.mips.inka.de (localhost [127.0.0.1])
	by kemoauc.mips.inka.de (8.13.1/8.12.10) with ESMTP id i8IDWpJA055056
	for <freebsd-arch@freebsd.org>; Sat, 18 Sep 2004 15:32:51 +0200 (CEST)
	(envelope-from mailnull@kemoauc.mips.inka.de)
Received: (from mailnull@localhost)
	by kemoauc.mips.inka.de (8.13.1/8.13.1/Submit) id i8IDWp4O055055
	for freebsd-arch@freebsd.org; Sat, 18 Sep 2004 15:32:51 +0200 (CEST)
	(envelope-from mailnull)
From: naddy@mips.inka.de (Christian Weisgerber)
Date: Sat, 18 Sep 2004 13:32:50 +0000 (UTC)
Message-ID: <cihde2$1lhv$1@kemoauc.mips.inka.de>
References: <16715.4611.108597.354107@piglet.timing.com>
	<p06110428bd70ee3b2bfa@[128.113.24.47]> <414B40B0.5030809@sitetronics.com>
	<16715.25678.610402.410860@piglet.timing.com>
Originator: naddy@mips.inka.de (Christian Weisgerber)
To: 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: Sat, 18 Sep 2004 13:32:54 -0000

Ben Mesander <ben@timing.com> wrote:

> A quick glance at the GNU sources of sdiff makes it seem to me that it
> may be possible to replace diff and diff3 with the OpenBSD versions
> and retain GNU sdiff until a replacement is written.

GNU sdiff calls diff with "--sdiff-merge-assist", which suggests
that the two are rather more intertwined.

-- 
Christian "naddy" Weisgerber                          naddy@mips.inka.de