]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 48bf2fa) | patch
mergetools/kdiff3: make kdiff3 work on Windows too
authorMichael Schindler <michael@compressconsult.com>
Mon, 7 Jun 2021 20:18:33 +0000 (20:18 +0000)
committerJunio C Hamano <gitster@pobox.com>
Tue, 8 Jun 2021 01:26:16 +0000 (10:26 +0900)
commit47eb4c689073eddc082007255564e1d3e142b727
tree0ab31aed011e055898e445a1a34aeb95b1bd1b0ftree | snapshot
parent48bf2fa8bad054d66bd79c6ba903c89c704201f7commit | diff
mergetools/kdiff3: make kdiff3 work on Windows too

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>
mergetools/kdiff3 diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.