From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jakub Narebski Subject: Re: [PATCH 2/2] mergetool: Don't keep temporary merge files unless told to Date: Fri, 12 Dec 2008 23:11:41 +0100 Organization: At home Message-ID: References: <1229118521-22923-1-git-send-email-charles@hashpling.org> <1229118521-22923-2-git-send-email-charles@hashpling.org> <1229118521-22923-3-git-send-email-charles@hashpling.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7Bit To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Fri Dec 12 23:13:13 2008 Return-path: Envelope-to: gcvg-git-2@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1LBGG1-0006Vj-2j for gcvg-git-2@gmane.org; Fri, 12 Dec 2008 23:13:13 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753907AbYLLWLz (ORCPT ); Fri, 12 Dec 2008 17:11:55 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753877AbYLLWLz (ORCPT ); Fri, 12 Dec 2008 17:11:55 -0500 Received: from main.gmane.org ([80.91.229.2]:57829 "EHLO ciao.gmane.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753441AbYLLWLz (ORCPT ); Fri, 12 Dec 2008 17:11:55 -0500 Received: from list by ciao.gmane.org with local (Exim 4.43) id 1LBGEe-0008RT-KP for git@vger.kernel.org; Fri, 12 Dec 2008 22:11:48 +0000 Received: from abvt119.neoplus.adsl.tpnet.pl ([83.8.217.119]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 12 Dec 2008 22:11:48 +0000 Received: from jnareb by abvt119.neoplus.adsl.tpnet.pl with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 12 Dec 2008 22:11:48 +0000 X-Injected-Via-Gmane: http://gmane.org/ X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: abvt119.neoplus.adsl.tpnet.pl Mail-Copies-To: Jakub Narebski User-Agent: KNode/0.10.2 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Charles Bailey wrote: > +mergetool.keepTemporaries:: mergetool.keepTemporaryFiles ? -- Jakub Narebski Warsaw, Poland ShadeHawk on #git