From 682a18445bedd4025b680cdb10f24c94e9eb775e Mon Sep 17 00:00:00 2001
From: Michael Schindler <michael@compressconsult.com>
Date: Wed, 25 Jun 2025 16:00:40 +0200
Subject: [PATCH] Update kdiff3 path

Newer windows versions of kdiff3 have kdiff3 in a bin folder.
This fix allows finding them.

Note that currently finding the tool cannot be configured unless you have write access to the changed file, since configuration is not honored
See for cause and fix
https://github.com/git/git/pull/1032
---
 mergetools/kdiff3 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mergetools/kdiff3 b/mergetools/kdiff3
index ee8b3a0570eff2..67edfb8309948a 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 "bin/kdiff3.exe" "Kdiff3"
 	fi
 }