Skip to content

Commit b885400

Browse files
pks-tgitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 2a8bd34 commit b885400

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

Documentation/meson.build

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -318,12 +318,11 @@ foreach mode : [ 'diff', 'merge' ]
318318
shell,
319319
'@INPUT@',
320320
'..',
321-
'diff',
321+
mode,
322322
'@OUTPUT@'
323323
],
324324
env: [
325325
'MERGE_TOOLS_DIR=' + meson.project_source_root() / 'mergetools',
326-
'TOOL_MODE=' + mode,
327326
],
328327
input: 'generate-mergetool-list.sh',
329328
output: 'mergetools-' + mode + '.txt',

0 commit comments

Comments
 (0)