Merge branch 'rs/difftool-env-simplify'

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

Junio C Hamano committed Jun 6, 2024 at 12:49 UTC df5c2c4962819e0baf9982e41905e0e3bc8ed9e8

No changes.