]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d11b0c7 36d900d)
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)
Code simplification.

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

1  2 
builtin/difftool.c patch | diff1 | diff2 | blob | history

diff --cc builtin/difftool.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.