From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sam Vilain Subject: Re: [PATCH] git-mergetool: add support for ediff Date: Mon, 02 Jul 2007 10:33:25 +1200 Message-ID: <46882BB5.8050208@vilain.net> References: <1183193781941-git-send-email-sam.vilain@catalyst.net.nz> <11831937813223-git-send-email-sam.vilain@catalyst.net.nz> <11831937822346-git-send-email-sam.vilain@catalyst.net.nz> <11831937823184-git-send-email-sam.vilain@catalyst.net.nz> <11831937823982-git-send-email-sam.vilain@catalyst.net.nz> <1183193782172-git-send-email-sam.vilain@catalyst.net.nz> <11831937822249-git-send-email-sam.vilain@catalyst.net.nz> <11831937823756-git-send-email-sam.vilain@catalyst.net.nz> <11831937822950-git-send-email-sam.vilain@catalyst.net.nz> <7vk5tle4wq.fsf@assigned-by-dhcp.cox.net> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Cc: git@vger.kernel.org, tytso@mit.edu To: Junio C Hamano X-From: git-owner@vger.kernel.org Mon Jul 02 00:33:34 2007 connect(): Connection refused Return-path: Envelope-to: gcvg-git@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1I57z3-0002Dw-2L for gcvg-git@gmane.org; Mon, 02 Jul 2007 00:33:33 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753730AbXGAWdb (ORCPT ); Sun, 1 Jul 2007 18:33:31 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751732AbXGAWda (ORCPT ); Sun, 1 Jul 2007 18:33:30 -0400 Received: from watts.utsl.gen.nz ([202.78.240.73]:60289 "EHLO magnus.utsl.gen.nz" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751484AbXGAWda (ORCPT ); Sun, 1 Jul 2007 18:33:30 -0400 Received: by magnus.utsl.gen.nz (Postfix, from userid 65534) id 2E39D15F3C1; Mon, 2 Jul 2007 10:33:29 +1200 (NZST) Received: from [192.168.2.22] (leibniz.catalyst.net.nz [202.78.240.7]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by magnus.utsl.gen.nz (Postfix) with ESMTP id 9AF1C15F3C0; Mon, 2 Jul 2007 10:33:25 +1200 (NZST) User-Agent: Thunderbird 1.5.0.10 (X11/20070307) In-Reply-To: <7vk5tle4wq.fsf@assigned-by-dhcp.cox.net> X-Enigmail-Version: 0.94.2.0 X-Spam-Checker-Version: SpamAssassin 3.0.2 (2004-11-16) on mail.magnus.utsl.gen.nz X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=ALL_TRUSTED autolearn=failed version=3.0.2 Sender: git-owner@vger.kernel.org Precedence: bulk X-Mailing-List: git@vger.kernel.org Archived-At: Junio C Hamano wrote: > I thought Ted said he'll look into clearning this up, so I won't > apply it yet at this moment to my tree, but have one comment... Yes, sorry I should have left this one out, it didn't get any changes. Sam.