diff options
| author | Armin Kunaschik <megabreit@googlemail.com> | 2016-07-02 21:01:51 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-07-06 12:18:09 -0700 |
| commit | c578a09bd6310157ea69bb1d2ec2d3d2cc58c85a (patch) | |
| tree | c4ae88302c134528606c264fe974076632e704fa /COPYING | |
| parent | 2ff7dff01e620dc87144e076d5bb7e866377df6a (diff) | |
| download | git-c578a09bd6310157ea69bb1d2ec2d3d2cc58c85a.tar.gz git-c578a09bd6310157ea69bb1d2ec2d3d2cc58c85a.tar.xz | |
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>
Diffstat (limited to 'COPYING')
0 files changed, 0 insertions, 0 deletions