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)
commitd0366b1...7c01ada0fc2cd97a151bc36bc4d30eeb
tree0cade68...6903f9909891d3996039b2bc90b816cdcopy hash to clipboard (tree)
parent1df2046...270011837c904d2b568b599bf61cdb87copy hash to clipboard (diff)
parentfa3142c...193bb31e7154d0f0cd7d15208a8dd51acopy hash to clipboard (diff)
t/t7610-mergetool.sh