From owner-freebsd-current@FreeBSD.ORG  Thu Dec 16 06:21:35 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 A809816A4CF; Thu, 16 Dec 2004 06:21:35 +0000 (GMT)
Received: from mail.lovett.com (core.lovett.com [216.168.8.20])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 6BFF043D48; Thu, 16 Dec 2004 06:21:35 +0000 (GMT)
	(envelope-from ade@FreeBSD.org)
Received: from 66-169-240-6.or.charter.com ([66.169.240.6]
	helo=[10.21.91.101])
	by mail.lovett.com with esmtpa (Exim 4.43 (FreeBSD))
	id 1Cep13-0008UL-Jd; Thu, 16 Dec 2004 06:21:33 +0000
Message-ID: <41C1296C.2020507@FreeBSD.org>
Date: Wed, 15 Dec 2004 22:21:32 -0800
From: Ade Lovett <ade@FreeBSD.org>
User-Agent: Mozilla Thunderbird 1.0 (Macintosh/20041206)
X-Accept-Language: en-us, en
MIME-Version: 1.0
To: Bob Willcox <bob@immure.com>
References: <41BF6D42.7040508@elischer.org>
	<m3hdmo4g7z.fsf@merlin.emma.line.org> <41C0B685.6050203@elischer.org>
	<20041215222101.GF53203@luke.immure.com>
In-Reply-To: <20041215222101.GF53203@luke.immure.com>
X-Enigmail-Version: 0.89.5.0
X-Enigmail-Supports: pgp-inline, pgp-mime
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
cc: ports@freebsd.org
cc: FreeBSD Current <freebsd-current@freebsd.org>
cc: Julian Elischer <julian@elischer.org>
Subject: Re: looking for a merge tool.
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: Thu, 16 Dec 2004 06:21:35 -0000

Bob Willcox wrote:
> On Wed, Dec 15, 2004 at 02:11:17PM -0800, Julian Elischer wrote:
> 
>>And the winner is:
>>
>>a tool Bob Willcox wrote called "tkmerge"

[snip]

> I would be happy to help with this. Having never done a port, however,
> I'm sure I will require some guidance.

Bob,

If no-one else has stepped up to the plate, drop me a line with the 
source files and where they can be pulled from (if you don't mind 
hosting them, or I can host them somewhere), and I'll knock out the port 
skeleton and commit it.

Cheers,
	-aDe