From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 13 Oct 2014 19:24:41 GMT
Subject: Re: [PATCH] mergetool: add an option for writing to a temporary directory
Message-ID: <xmqqk3433h8m.fsf@gitster.dls.corp.google.com>
In-Reply-To: <1413047085-12398-1-git-send-email-davvid@gmail.com>

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>