mirror of
https://github.com/git/git.git
synced 2025-12-12 20:36:24 +01:00
doc: generate a list of valid merge tools
Use the show_tool_names() function to build lists of all the built-in tools supported by difftool and mergetool. This frees us from needing to update the documentation whenever a new tool is added. Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
committed by
Junio C Hamano
parent
665682c9fd
commit
f35ec54600
@@ -1,6 +1,7 @@
|
||||
#!/bin/sh
|
||||
# git-mergetool--lib is a library for common merge tool functions
|
||||
MERGE_TOOLS_DIR=$(git --exec-path)/mergetools
|
||||
|
||||
: ${MERGE_TOOLS_DIR=$(git --exec-path)/mergetools}
|
||||
|
||||
mode_ok () {
|
||||
if diff_mode
|
||||
|
||||
Reference in New Issue
Block a user