averello/git-mirror
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-01 18:24:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'pw/meson-doc-mergetool' into next

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

* pw/meson-doc-mergetool:
  meson: fix building mergetool docs
This commit is contained in:
Junio C Hamano
2026-02-22 12:27:59 -08:00
parent 920d0c2836 58e4eeeeb5
commit dfdfff02f8
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Documentation/meson.build
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',
)