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 /Documentation/howto/revert-a-faulty-merge.txt | |
| parent | mergetool--lib: list user configured tools in '--tool-help' (diff) | |
| download | tgif-f35ec546008e8390e0fd8e545680e72fae0efa35.tar.xz | |
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 'Documentation/howto/revert-a-faulty-merge.txt')
0 files changed, 0 insertions, 0 deletions