diff options
| author | Patrick Steinhardt <ps@pks.im> | 2024-12-27 14:59:31 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-12-27 08:28:09 -0800 |
| commit | b88540045c3d70dbf4138c8f32209fea32e40d90 (patch) | |
| tree | fa12b969336c8300cc7c40dfde235a01038ee49b /commit.c | |
| parent | meson: properly wire up dependencies for our docs (diff) | |
| download | git-b88540045c3d70dbf4138c8f32209fea32e40d90.tar.gz git-b88540045c3d70dbf4138c8f32209fea32e40d90.zip | |
meson: fix generation of merge tools
Our buildsystems generate a list of diff and merge tools that ultimately
end up in our documentation. And while Meson does wire up the logic, it
tries to use the TOOL_MODE environment variable to set up the mode. This
is wrong though: the mode is set via an argument that we have fixed to
'diff' mode by accident.
Fix this such that merge tools are properly generated.
Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'commit.c')
0 files changed, 0 insertions, 0 deletions