From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 15 Oct 2014 20:45:42 GMT
Subject: Re: [PATCH] mergetool: add an option for writing to a temporary directory
Message-ID: <xmqq1tq9vz7t.fsf@gitster.dls.corp.google.com>
In-Reply-To: <293924028.621540.1413401411270.JavaMail.zimbra@dewire.com>

Robin Rosenberg <robin.rosenberg.lists@dewire.com> writes:

> ----- Ursprungligt meddelande -----
>> Från: "David Aguilar" <davvid@gmail.com>
>> Till: "Junio C Hamano" <gitster@pobox.com>
>> Kopia: "Robin Rosenberg" <robin.rosenberg@dewire.com>,
>> git@vger.kernel.org, "Charles Bailey" <charles@hashpling.org>
>> Skickat: onsdag, 15 okt 2014 8:38:49
>> Ämne: Re: [PATCH] mergetool: add an option for writing to a temporary directory
>> 
>> On Mon, Oct 13, 2014 at 12:24:41PM -0700, Junio C Hamano wrote:
>> > David Aguilar <davvid@gmail.com> writes:
>> > 
>> > > Teach mergetool to write files in a temporary directory when
>> > > 'mergetool.writeToTemp' is true.
>> > >
>> > > This is helpful for tools such as Eclipse which cannot cope with
>> > > multiple copies of the same file in the worktree.
>> > 
>> > With this can we drop the "change the temporary file name" patch by
>> > Robin Rosenberg?
>> > 
>> > http://thread.gmane.org/gmane.comp.version-control.git/255457/focus=255599
>> > 
>> > Message-Id: <1408607240-11369-1-git-send-email-robin.rosenberg@dewire.com>
>> 
>> I would think so but I'm biased ;-)
>
> The new patch solves my problem.

Thanks.  Let's move David's series forward then.