From owner-freebsd-current@FreeBSD.ORG Wed Dec 15 07:44:18 2004 Return-Path: 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 01A2716A4CE for ; Wed, 15 Dec 2004 07:44:18 +0000 (GMT) Received: from gateway.nixsys.be (gateway.nixsys.be [195.144.77.33]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4755443D46 for ; Wed, 15 Dec 2004 07:44:17 +0000 (GMT) (envelope-from philip@nixsys.be) Received: from loge.nixsys.be (loge.nixsys.be [195.144.77.45]) by gateway.nixsys.be (Postfix) with ESMTP id 2388F129 for ; Wed, 15 Dec 2004 08:44:16 +0100 (CET) Received: from loge.nixsys.be (philip@localhost [127.0.0.1]) by loge.nixsys.be (8.13.1/8.13.1) with ESMTP id iBF7iF6f000917; Wed, 15 Dec 2004 08:44:15 +0100 (CET) (envelope-from philip@loge.nixsys.be) Received: (from philip@localhost) by loge.nixsys.be (8.13.1/8.13.1/Submit) id iBF7iC02000916; Wed, 15 Dec 2004 08:44:12 +0100 (CET) (envelope-from philip) Date: Wed, 15 Dec 2004 08:44:11 +0100 From: Philip Paeps To: Julian Elischer Message-ID: <20041215074411.GA655@loge.nixsys.be> Mail-Followup-To: Julian Elischer , FreeBSD Current References: <41BF6D42.7040508@elischer.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <41BF6D42.7040508@elischer.org> X-Date-in-Rome: ante diem XVIII Kalendas Ianuarias MMDCCLVIII ab Urbe Condida X-PGP-Fingerprint: FA74 3C27 91A6 79D5 F6D3 FC53 BF4B D0E6 049D B879 X-Message-Flag: Get a proper mailclient! Organization: Happily Disorganized User-Agent: Mutt/1.5.6i cc: FreeBSD Current 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Dec 2004 07:44:18 -0000 On 2004-12-14 14:46:26 (-0800), Julian Elischer wrote: > I'm doing a bit of merging fromthe NetBSD USB code to -current, but I'm > wonderring if anyone can point me to a good merge tool. Not sure if it's a ``good'' tool, but I'm very fond of Vim's diff feature. It took me a while to get used to, but it's proven itself very useful to me since. Particularly the pretty colouring and the fact that I can jump around and place marks like in Vim make me very happy with it :-) > does anyone know of a tool that gives 3 panes and allows manual editing of > the merged product? Vimdiff allows you to do that. I'm sure there will be some Emacs users now to tell me that I should go and use Emacs because it does it better. - Philip -- Philip Paeps Please don't Cc me, I am philip@freebsd.org subscribed to the list. BOFH Excuse #207: We are currently trying a new concept of using a live mouse. Unfortunately, one has yet to survive being hooked up to the computer.....please bear with us.