diff options
author | Junio C Hamano <gitster@pobox.com> | 2022-05-10 17:41:11 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2022-05-10 17:41:11 -0700 |
commit | 123dfdff0d6e886ce5536d39dd77dcd46db8d4c0 (patch) | |
tree | f4773e28ec45311814abcd32f94ab581a2a24895 /Documentation/Makefile | |
parent | c237c3fd5f038802f3d390c2e1aba9d0fd2f1fd9 (diff) | |
parent | 980145f7470e20826ca22d7343494712eda9c81d (diff) | |
download | git-123dfdff0d6e886ce5536d39dd77dcd46db8d4c0.tar.gz |
Merge branch 'fr/vimdiff-layout'
Reimplement "vimdiff[123]" mergetool drivers with a more generic
layout mechanism.
* fr/vimdiff-layout:
mergetools: add description to all diff/merge tools
vimdiff: add tool documentation
vimdiff: integrate layout tests in the unit tests framework ('t' folder)
vimdiff: new implementation with layout support
Diffstat (limited to 'Documentation/Makefile')
-rw-r--r-- | Documentation/Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/Makefile b/Documentation/Makefile index 44c080e3e5..adb2f1b50a 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -302,12 +302,12 @@ $(mergetools_txt): mergetools-list.made mergetools-list.made: ../git-mergetool--lib.sh $(wildcard ../mergetools/*) $(QUIET_GEN) \ - $(SHELL_PATH) -c 'MERGE_TOOLS_DIR=../mergetools && \ + $(SHELL_PATH) -c 'MERGE_TOOLS_DIR=../mergetools && TOOL_MODE=diff && \ . ../git-mergetool--lib.sh && \ - show_tool_names can_diff "* " || :' >mergetools-diff.txt && \ - $(SHELL_PATH) -c 'MERGE_TOOLS_DIR=../mergetools && \ + show_tool_names can_diff' | sed -e "s/\([a-z0-9]*\)/\`\1\`;;/" >mergetools-diff.txt && \ + $(SHELL_PATH) -c 'MERGE_TOOLS_DIR=../mergetools && TOOL_MODE=merge && \ . ../git-mergetool--lib.sh && \ - show_tool_names can_merge "* " || :' >mergetools-merge.txt && \ + show_tool_names can_merge' | sed -e "s/\([a-z0-9]*\)/\`\1\`;;/" >mergetools-merge.txt && \ date >$@ TRACK_ASCIIDOCFLAGS = $(subst ','\'',$(ASCIIDOC_COMMON):$(ASCIIDOC_HTML):$(ASCIIDOC_DOCBOOK)) |