John Keeping <j...@keeping.me.uk> writes:

> Signed-off-by: John Keeping <j...@keeping.me.uk>
> ---
>  git-mergetool--lib.sh | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)

Thanks.

> diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh
> index 25631cd..b6ed2fa 100644
> --- a/git-mergetool--lib.sh
> +++ b/git-mergetool--lib.sh
> @@ -34,9 +34,9 @@ show_tool_names () {
>                               then
>                                       echo "$preamble"
>                                       preamble=
> -                                     shown_any=yes
>                               fi
> -                             printf "%s%s\n" "$per_line_prefix" "$tool"
> +                             shown_any=yes
> +                             printf "%s%s\n" "$per_line_prefix" "$toolname"

Thanks for spotting s/tool/toolname/; does the change to shown_any
matter, though?

>                       fi
>               done
>               test -n "$shown_any"
> @@ -244,6 +244,7 @@ show_tool_help () {
>  
>       tab='   ' av_shown= unav_shown=
>  
> +     cmd_name=${TOOL_MODE}tool
>       if show_tool_names 'mode_ok && is_available' "$tab$tab" \
>               "$tool_opt may be set to one of the following:"
>       then
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to