From: Armin Kunaschik <megabreit@googlemail.com>
Date: Sat, 2 Jul 2016 19:01:51 +0000 (+0200)
Subject: t7610: test for mktemp before test execution
X-Git-Tag: v2.9.3~46^2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/c578a09bd6310157ea69bb1d2ec2d3d2cc58c85a?hp=c578a09bd6310157ea69bb1d2ec2d3d2cc58c85a

t7610: test for mktemp before test execution

mktemp is not available on all platforms, so the test
'temporary filenames are used with mergetool.writeToTemp'
fails there.
This patch does not replace mktemp but just disables
the test that otherwise would fail.
mergetool checks itself before executing mktemp and
reports an error.

Signed-off-by: Armin Kunaschik <megabreit@googlemail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---