From f35ec546008e8390e0fd8e545680e72fae0efa35 Mon Sep 17 00:00:00 2001
From: David Aguilar <davvid@gmail.com>
Date: Sun, 27 Jan 2013 16:52:26 -0800
Subject: 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>
---
 git-mergetool--lib.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'git-mergetool--lib.sh')

diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh
index 330b036ac..e338be5e5 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
-- 
cgit v1.2.1