summaryrefslogtreecommitdiff
path: root/builtin/merge-file.c
diff options
context:
space:
mode:
authorLibravatar Ævar Arnfjörð Bjarmason <avarab@gmail.com>2021-11-25 23:52:23 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-11-25 22:15:08 -0800
commit26a15355d60a0a5be08250512c05e1447036dce3 (patch)
treeeb0758b28f4cf4c287dcf98af93ca7a0a9da4707 /builtin/merge-file.c
parentrun-command API: remove "argv" member, always use "args" (diff)
downloadtgif-26a15355d60a0a5be08250512c05e1447036dce3.tar.xz
difftool: use "env_array" to simplify memory management
Amend code added in 03831ef7b50 (difftool: implement the functionality in the builtin, 2017-01-19) to use the "env_array" in the run_command.[ch] API. Now we no longer need to manage our own "index_env" buffer. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-file.c')
0 files changed, 0 insertions, 0 deletions