Merge branch 'da/gitk-reload-tag-contents' into maint-1.7.11

diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh
index ed630b208a80a36d729b5074a39bc53df0cabd59..f730253c0eac181ec8507d2c837d4ec85a0ae991 100644 (file)
--- a/git-mergetool--lib.sh
+++ b/git-mergetool--lib.sh
@@ -111,7 +111,7 @@ run_merge_tool () {
        return $status
 }
 
-guess_merge_tool () {
+list_merge_tool_candidates () {
        if merge_mode
        then
                tools="tortoisemerge"
@@ -136,6 +136,10 @@ guess_merge_tool () {
                tools="$tools emerge vimdiff"
                ;;
        esac
+}
+
+guess_merge_tool () {
+       list_merge_tool_candidates
        echo >&2 "merge tool candidates: $tools"
 
        # Loop over each candidate and stop when a valid merge tool is found.