mirror of
https://github.com/git/git.git
synced 2024-05-10 06:06:10 +02:00
47eb4c6890
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> |
||
|---|---|---|
| .. | ||
| araxis | ||
| bc | ||
| codecompare | ||
| deltawalker | ||
| diffmerge | ||
| diffuse | ||
| ecmerge | ||
| emerge | ||
| examdiff | ||
| guiffy | ||
| gvimdiff | ||
| kdiff3 | ||
| kompare | ||
| meld | ||
| nvimdiff | ||
| opendiff | ||
| p4merge | ||
| smerge | ||
| tkdiff | ||
| tortoisemerge | ||
| vimdiff | ||
| winmerge | ||
| xxdiff | ||