Merge branch 'ak/lazy-prereq-mktemp' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 17 Jan 2017 23:19:04 +0000 (15:19 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 17 Jan 2017 23:19:04 +0000 (15:19 -0800)
Test code clean-up.

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

1  2 
t/t7610-mergetool.sh
Simple merge