From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 16 Jan 2023 20:07:46 +0000 (-0800)
Subject: Merge branch 'jk/ext-diff-with-relative'
X-Git-Tag: v2.40.0-rc0~94
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1120c54c12788c232d96702702e719f72e7ece14;p=thirdparty%2Fgit.git

Merge branch 'jk/ext-diff-with-relative'

"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
---

1120c54c12788c232d96702702e719f72e7ece14