From: Junio C Hamano Date: Fri, 20 May 2022 22:26:55 +0000 (-0700) Subject: Merge branch 'rs/external-diff-tempfile' X-Git-Tag: v2.37.0-rc0~77 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2e969751ec29bf948ce8ab3eef111d01b4293a42;p=thirdparty%2Fgit.git Merge branch 'rs/external-diff-tempfile' The temporary files fed to external diff command are now generated inside a new temporary directory under the same basename. * rs/external-diff-tempfile: diff: use mks_tempfile_dt() tempfile: add mks_tempfile_dt() --- 2e969751ec29bf948ce8ab3eef111d01b4293a42