From owner-freebsd-arch@FreeBSD.ORG  Fri Sep 17 23:03:32 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 A5C8C16A4D0
	for <freebsd-arch@freebsd.org>; Fri, 17 Sep 2004 23:03:32 +0000 (GMT)
Received: from mail-in-01.arcor-online.net (mail-in-04.arcor-online.net
	[151.189.21.44])
	by mx1.FreeBSD.org (Postfix) with ESMTP id AEF4E43D45
	for <freebsd-arch@freebsd.org>; Fri, 17 Sep 2004 23:03:31 +0000 (GMT)
	(envelope-from mailnull@mips.inka.de)
Received: from kemoauc.mips.inka.de (dsl-213-023-057-140.arcor-ip.net
	[213.23.57.140])
	by mail-in-01.arcor-online.net (Postfix) with ESMTP id 2A68E39ECD
	for <freebsd-arch@freebsd.org>;
	Sat, 18 Sep 2004 01:03:30 +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 i8HN3Tg9068268
	for <freebsd-arch@freebsd.org>; Sat, 18 Sep 2004 01:03:29 +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 i8HN3TVP068267
	for freebsd-arch@freebsd.org; Sat, 18 Sep 2004 01:03:29 +0200 (CEST)
	(envelope-from mailnull)
From: naddy@mips.inka.de (Christian Weisgerber)
Date: Fri, 17 Sep 2004 23:03:27 +0000 (UTC)
Message-ID: <cifqfv$224u$1@kemoauc.mips.inka.de>
References: <16715.4611.108597.354107@piglet.timing.com>
	<p06110428bd70ee3b2bfa@[128.113.24.47]> <414B40B0.5030809@sitetronics.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: Fri, 17 Sep 2004 23:03:32 -0000

Devon H. O'Dell <dodell@sitetronics.com> wrote:

> Does OpenBSD's diffutils include sdiff? If not, this will be broken.

No, it does not, which is very inconvenient for mergemaster.

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