From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 6 Jun 2024 19:49:24 +0000 (-0700)
Subject: Merge branch 'rs/difftool-env-simplify'
X-Git-Tag: v2.46.0-rc0~74
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=df5c2c4962819e0baf9982e41905e0e3bc8ed9e8;p=thirdparty%2Fgit.git

Merge branch 'rs/difftool-env-simplify'

Code simplification.

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

df5c2c4962819e0baf9982e41905e0e3bc8ed9e8