----- Ursprungligt meddelande ----- > Från: "David Aguilar" <davvid@xxxxxxxxx> > Till: "Junio C Hamano" <gitster@xxxxxxxxx> > Kopia: "Robin Rosenberg" <robin.rosenberg@xxxxxxxxxx>, git@xxxxxxxxxxxxxxx, "Charles Bailey" <charles@xxxxxxxxxxxxx> > 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@xxxxxxxxx> 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@xxxxxxxxxx> > > I would think so but I'm biased ;-) The new patch solves my problem. -- robin -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html