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> -- 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