Update kdiff3

[michaelcompressconsult]

newer versions of kdiff3 for windows install the executable for windows in a bin subfolder. This change changes the place where the executable is searched to the new location if not found in %PATH%

fetch a recent windows version from https://download.kde.org/stable/kdiff3/ to see.

[gitgitgadget]

There are issues in commit 32e944b:
Update kdiff3
Commit not signed off
Lines in the body of the commit messages should be wrapped between 60 and 76 characters.
Indented lines, and lines without whitespace, are exempt

[gitgitgadget]

There are issues in commit 8e55f6d:
Update kdiff3
Lines in the body of the commit messages should be wrapped between 60 and 76 characters.
Indented lines, and lines without whitespace, are exempt

[michaelcompressconsult]

/submit

[gitgitgadget]

Submitted as pull.1376.git.1665141449621.gitgitgadget@gmail.com

To fetch this version into FETCH_HEAD:

git fetch https://github.com/gitgitgadget/git/ pr-1376/michaelcompressconsult/kdiff3_win_moved-v1

To fetch this version to local tag pr-1376/michaelcompressconsult/kdiff3_win_moved-v1:

git fetch --no-tags https://github.com/gitgitgadget/git/ tag pr-1376/michaelcompressconsult/kdiff3_win_moved-v1

[gitgitgadget]

On the Git mailing list, Junio C Hamano wrote (reply to this):

"Michael Schindler via GitGitGadget" <gitgitgadget@gmail.com>
writes:

> From: Michael Schindler <michael@compressconsult.com>
>
> newer versions of kdiff3 for windows install the executable for windows
> in a /bin subfolder.
> This change changes the place where the executable is searched to the new
> location if not found in %PATH%

What happens to those who already have kdiff3 on Windows and haven't
upgraded to the ones installed in the /bin subfolder with this
change?

> diff --git a/mergetools/kdiff3 b/mergetools/kdiff3
> index ee8b3a0570e..c26a9573815 100644
> --- a/mergetools/kdiff3
> +++ b/mergetools/kdiff3
> @@ -39,6 +39,6 @@ translate_merge_tool_path() {
>  	then
>  		echo kdiff3
>  	else
> -		mergetool_find_win32_cmd "kdiff3.exe" "Kdiff3"
> +		mergetool_find_win32_cmd "kdiff3.exe" "Kdiff3/bin"
>  	fi
>  }

Will they lose the access to kdiff3 backend when they upgrade their
Git to a version that includes this change, or is the old location
expected to be on %PATH%?  I find the latter unlikely---the original
would not have bothered to use mergetool_find_win32_cmd if that were
the case.

I am wondering if mergetool_find_win32_cmd should take multiple
candidate directories, not just a single directory, so that users of
old and new versions are both kept happy.

Thanks.