diff options
| author | David Aguilar <davvid@gmail.com> | 2013-01-27 16:52:26 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-02-02 21:46:52 -0800 |
| commit | f35ec546008e8390e0fd8e545680e72fae0efa35 (patch) | |
| tree | a9877d98b18e0cb133ff6b861e86aa9b9fb36634 /git-mergetool--lib.sh | |
| parent | 665682c9fd81df7e2dc8fe9db28fa5918a2f8ba0 (diff) | |
| download | git-f35ec546008e8390e0fd8e545680e72fae0efa35.tar.gz | |
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>
Diffstat (limited to 'git-mergetool--lib.sh')
| -rw-r--r-- | git-mergetool--lib.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh index 330b036ac9..e338be5e57 100644 --- a/git-mergetool--lib.sh +++ b/git-mergetool--lib.sh @@ -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 |