Merge branch 'ak/lazy-prereq-mktemp' into next
authorJunio C Hamano <gitster@pobox.com>
Mon, 12 Dec 2016 18:57:11 +0000 (10:57 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 12 Dec 2016 18:57:11 +0000 (10:57 -0800)
commitf346d1f053307c7091e9a1e8539af82c4cf54817
treef5a315d839888870f4ad4481f66059b79dddb221
parent50b5d28af4659e980216e6a164f5ae0978e161d5
parentfa3142c9193bb31e7154d0f0cd7d15208a8dd51a
Merge branch 'ak/lazy-prereq-mktemp' into next

Test code clean-up.

* ak/lazy-prereq-mktemp:
  t7610: clean up foo.XXXXXX tmpdir
t/t7610-mergetool.sh