diff options
| author | Junio C Hamano <gitster@pobox.com> | 2026-03-02 17:06:52 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2026-03-02 17:06:52 -0800 |
| commit | 112252c844d2262bb22c22d009c341c8258ee045 (patch) | |
| tree | 60ccd5001b594a190a8f10a3693aa88c56cc8ce3 | |
| parent | 05c4af5c8f3d7310c8a3b2909d30ce761c6757aa (diff) | |
| parent | 58e4eeeeb5439dc1f629579ba03844500827ff20 (diff) | |
| download | git-112252c844d2262bb22c22d009c341c8258ee045.tar.gz git-112252c844d2262bb22c22d009c341c8258ee045.zip | |
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
| -rw-r--r-- | Documentation/meson.build | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/Documentation/meson.build b/Documentation/meson.build index fd2e8cc02d..d6365b888b 100644 --- a/Documentation/meson.build +++ b/Documentation/meson.build @@ -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', ) |