From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 28 Jun 2024 22:53:16 +0000 (-0700)
Subject: Merge branch 'rs/difftool-env-simplify' into maint-2.45
X-Git-Tag: v2.46.0-rc0~22^2~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7b7db54b8319aa4f31348debb4bd9b838753aa8c;p=thirdparty%2Fgit.git

Merge branch 'rs/difftool-env-simplify' into maint-2.45

Code simplification.

* rs/difftool-env-simplify:
  difftool: add env vars directly in run_file_diff()
---

7b7db54b8319aa4f31348debb4bd9b838753aa8c