Merge branch 'ms/mergetools-kdiff3-on-windows'

On Windows, mergetool has been taught to find kdiff3.exe just like it finds winmerge.exe. * ms/mergetools-kdiff3-on-windows: mergetools/kdiff3: make kdiff3 work on Windows too
git · Jul 8, 2021 · b7bd70d · b7bd70d
2 parents e867110 + 47eb4c6
commit b7bd70d
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/mergetools/kdiff3 b/mergetools/kdiff3
@@ -25,3 +25,12 @@ merge_cmd () {
 exit_code_trustable () {
 	true
 }
+
+translate_merge_tool_path() {
+	if type kdiff3 >/dev/null 2>/dev/null
+	then
+		echo kdiff3
+	else
+		mergetool_find_win32_cmd "kdiff3.exe" "Kdiff3"
+	fi
+}