From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.176.0/21 X-Spam-Status: No, score=-3.4 required=3.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MSGID_FROM_MTA_HEADER,RP_MATCHES_RCVD shortcircuit=no autolearn=ham autolearn_force=no version=3.4.0 From: "Martin Langhoff" Subject: Re: [PATCH] Introducing cg-xxdiff for conflict resolution Date: Fri, 3 Nov 2006 12:40:38 +1300 Message-ID: <46a038f90611021540s14b6098p477a68ef00c826e9@mail.gmail.com> References: <11546624471356-git-send-email-martin@catalyst.net.nz> <20060924165037.GS20017@pasky.or.cz> <46a038f90609241002i1db98ed6n118077089c9e417f@mail.gmail.com> <20060924171246.GY13132@pasky.or.cz> <46a038f90609241022i6ac11da1o1a1cba199595d036@mail.gmail.com> <20060924172838.GZ13132@pasky.or.cz> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit NNTP-Posting-Date: Thu, 2 Nov 2006 23:40:57 +0000 (UTC) Cc: "Martin Langhoff" , git@vger.kernel.org Return-path: Envelope-to: gcvg-git@gmane.org DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=beta; d=gmail.com; h=received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references; b=ATVxW+HOeNXN/ezMmFJdt8DW/4GNOyqPSMKBzDvViws6Y9ioqAFW8xG4K1caIC9ffzy+FFZzNgXZVixCF3MHLp8DtpaGtOkJY864hsRZrIGIafAr6ST7bftunYG7m/BY/OTz75ePlSQLuDbNtU1EjfID0DfkxEPV9W1x6IeCLw0= In-Reply-To: <20060924172838.GZ13132@pasky.or.cz> Content-Disposition: inline Precedence: bulk X-Mailing-List: git@vger.kernel.org Archived-At: Received: from vger.kernel.org ([209.132.176.167]) by ciao.gmane.org with esmtp (Exim 4.43) id 1GfmAv-0004h1-Qm for gcvg-git@gmane.org; Fri, 03 Nov 2006 00:40:46 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752711AbWKBXkm (ORCPT ); Thu, 2 Nov 2006 18:40:42 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752809AbWKBXkm (ORCPT ); Thu, 2 Nov 2006 18:40:42 -0500 Received: from nf-out-0910.google.com ([64.233.182.191]:34505 "EHLO nf-out-0910.google.com") by vger.kernel.org with ESMTP id S1752711AbWKBXkm (ORCPT ); Thu, 2 Nov 2006 18:40:42 -0500 Received: by nf-out-0910.google.com with SMTP id c2so1558490nfe for ; Thu, 02 Nov 2006 15:40:40 -0800 (PST) Received: by 10.48.220.15 with SMTP id s15mr192655nfg.1162510839026; Thu, 02 Nov 2006 15:40:39 -0800 (PST) Received: by 10.49.60.1 with HTTP; Thu, 2 Nov 2006 15:40:38 -0800 (PST) To: "Petr Baudis" Sender: git-owner@vger.kernel.org On 9/25/06, Petr Baudis wrote: > > >But I can adjust such details when applying your patch. > > > > Great! -- I'm travelling and at an airport "free access" computer. It > > should be illegal to run airports without free wifi in this day and > > age. > > Heartily agreed. Paski, did this one get dropped? Change of heart? Heart attack? cheers,