From: Michael Schindler <michael@xxxxxxxxxxxxxxxxxxx> 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. Signed-off-by: Michael Schindler <michael.schindler@xxxxxxxxxx> --- Update kdiff3 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. Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1376%2Fmichaelcompressconsult%2Fkdiff3_win_moved-v1 Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1376/michaelcompressconsult/kdiff3_win_moved-v1 Pull-Request: https://github.com/gitgitgadget/git/pull/1376 mergetools/kdiff3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 } base-commit: 3dcec76d9df911ed8321007b1d197c1a206dc164 -- gitgitgadget
