From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 21 Oct 2014 20:28:42 +0000 (-0700)
Subject: Merge branch 'da/mergetool-temporary-directory'
X-Git-Tag: v2.2.0-rc0~28
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a46af5946c3ec125e0c2fee889610485eb4a6e14;p=git

Merge branch 'da/mergetool-temporary-directory'

Allow a temporary directory specified to be used while running "git
mergetool" backend.

* da/mergetool-temporary-directory:
  t7610-mergetool: add test cases for mergetool.writeToTemp
  mergetool: add an option for writing to a temporary directory
---

a46af5946c3ec125e0c2fee889610485eb4a6e14