From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 14 Feb 2023 22:15:50 +0000 (-0800)
Subject: Merge branch 'jk/ext-diff-with-relative' into maint-2.39
X-Git-Tag: v2.40.0-rc0~24^2~22
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f8382a639667aedb08afa95339d494d5ed6b370f;p=thirdparty%2Fgit.git

Merge branch 'jk/ext-diff-with-relative' into maint-2.39

"git diff --relative" did not mix well with "git diff --ext-diff",
which has been corrected.

* jk/ext-diff-with-relative:
  diff: drop "name" parameter from prepare_temp_file()
  diff: clean up external-diff argv setup
  diff: use filespec path to set up tempfiles for ext-diff
---

f8382a639667aedb08afa95339d494d5ed6b370f