undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mergetools/kdiff3: make kdiff3 work on Windows too

Browse Source 
The native kdiff3 mergetool is not found by git mergetool on
Windows.  The message "The merge tool kdiff3 is not available as
'kdiff3'" is displayed.

Just like we translate the name of the binary and look for it on the
search path for WinMerge, do the same for kdiff3 to find it.

Signed-off-by: Michael Schindler michael@compressconsult.com
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Michael Schindler 2021-06-07 20:18:33 +00:00 committed by Junio C Hamano
parent 48bf2fa8ba
commit 47eb4c6890
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mergetools/kdiff3
View File

@ -25,3 +25,12 @@ merge_cmd () {
exit_code_trustable () { exit_code_trustable () {
true 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
}