]> git.ipfire.org Git - thirdparty/git.git/commit
Merge branch 'rs/difftool-env-simplify'
authorJunio C Hamano <gitster@pobox.com>
Thu, 6 Jun 2024 19:49:24 +0000 (12:49 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 6 Jun 2024 19:49:24 +0000 (12:49 -0700)
commitdf5c2c4962819e0baf9982e41905e0e3bc8ed9e8
tree729d7162f3f8bdb0f73c06b1c18b9dda52c1e0ab
parentd11b0c75eca9b9cf0ede8caa0778faf6f22f674e
parent36d900d2b0b861d4cb359ddbaa904de90336eb71
Merge branch 'rs/difftool-env-simplify'

Code simplification.

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