Merge branch 'pw/meson-doc-mergetool'

Update build precedure for mergetool documentation in meson-based builds.

* pw/meson-doc-mergetool:
  meson: fix building mergetool docs
maint
Junio C Hamano 2026-03-02 17:06:52 -08:00
commit 112252c844
1 changed files with 1 additions and 4 deletions

View File

@ -354,13 +354,10 @@ foreach mode : [ 'diff', 'merge' ]
command: [
shell,
'@INPUT@',
'..',
meson.project_source_root(),
mode,
'@OUTPUT@'
],
env: [
'MERGE_TOOLS_DIR=' + meson.project_source_root() / 'mergetools',
],
input: 'generate-mergetool-list.sh',
output: 'mergetools-' + mode + '.adoc',
)