From mboxrd@z Thu Jan 1 00:00:00 1970 From: Johannes Sixt Subject: Re: [PATCH v2] difftool: don't overwrite modified files Date: Tue, 26 Mar 2013 09:47:17 +0100 Message-ID: <51516095.7030602@viscovery.net> References: <7vd2up4bo7.fsf@alter.siamese.dyndns.org> <20130324123620.GA2286@serenity.lan> <20130324151557.GB2286@serenity.lan> <514FFFC7.3090004@viscovery.net> <20130325104219.GD2286@serenity.lan> <20130325214430.GG2286@serenity.lan> <51515E92.4030009@viscovery.net> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: Matt McClure , Junio C Hamano , git@vger.kernel.org, David Aguilar , Sitaram Chamarty , Jonathan Nieder To: John Keeping X-From: git-owner@vger.kernel.org Tue Mar 26 09:47:51 2013 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1UKPXq-0000Yn-Rv for gcvg-git-2@plane.gmane.org; Tue, 26 Mar 2013 09:47:51 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759472Ab3CZIrV (ORCPT ); Tue, 26 Mar 2013 04:47:21 -0400 Received: from so.liwest.at ([212.33.55.24]:28823 "EHLO so.liwest.at" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759426Ab3CZIrT (ORCPT ); Tue, 26 Mar 2013 04:47:19 -0400 Received: from [81.10.228.254] (helo=theia.linz.viscovery) by so.liwest.at with esmtpa (Exim 4.77) (envelope-from ) id 1UKPXK-0000ip-BP; Tue, 26 Mar 2013 09:47:18 +0100 Received: from [192.168.1.95] (J6T.linz.viscovery [192.168.1.95]) by theia.linz.viscovery (Postfix) with ESMTP id 0C0531660F; Tue, 26 Mar 2013 09:47:17 +0100 (CET) User-Agent: Mozilla/5.0 (Windows NT 5.1; rv:17.0) Gecko/20130307 Thunderbird/17.0.4 In-Reply-To: <51515E92.4030009@viscovery.net> X-Spam-Score: -1.0 (-) Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Forgot to mention: The patch passes t7800 on Windows. Thanks, -- Hannes