Merge branch 'rs/difftool-env-simplify' into maint-2.45
commit7b7db54b8319aa4f31348debb4bd9b838753aa8c
authorJunio C Hamano <gitster@pobox.com>
Fri, 28 Jun 2024 22:53:16 +0000 (28 15:53 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 28 Jun 2024 22:53:16 +0000 (28 15:53 -0700)
treeb4928d7e6294890e8761d46c1665fbffa60bfa48
parent6e3eb346edf9f9b701c916148a3cdd74505fdd11
parent36d900d2b0b861d4cb359ddbaa904de90336eb71
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()