summaryrefslogtreecommitdiff
path: root/ll-merge.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-07-28 18:26:03 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-07-28 18:26:03 (GMT)
commit1ecc6b291c162b9fc7b59a3251c4cbbcf3b07b84 (patch)
tree03e3f09002e7a66e7e1a19146c66a3d72ce8936e /ll-merge.c
parent6cbec0da471590a2b3de1b98795ba20f274d53fa (diff)
parentc578a09bd6310157ea69bb1d2ec2d3d2cc58c85a (diff)
downloadgit-1ecc6b291c162b9fc7b59a3251c4cbbcf3b07b84.zip
git-1ecc6b291c162b9fc7b59a3251c4cbbcf3b07b84.tar.gz
git-1ecc6b291c162b9fc7b59a3251c4cbbcf3b07b84.tar.bz2
Merge branch 'ak/lazy-prereq-mktemp' into maint
A test that unconditionally used "mktemp" learned that the command is not necessarily available everywhere. * ak/lazy-prereq-mktemp: t7610: test for mktemp before test execution
Diffstat (limited to 'll-merge.c')
0 files changed, 0 insertions, 0 deletions