| commit | b7bd70ddd4d38b16a1af6975df8077306ee998da | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 8 Jul 2021 20:15:04 +0000 (8 13:15 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 8 Jul 2021 20:15:04 +0000 (8 13:15 -0700) | ||
| tree | 070e538c7e1a6c9e750a96b66eb293678309c03c | treesnapshot (tar.gz zip) |
| parent | e867110340c236d2ba977d2c4bf1274a297f4e21 | commitdiff |
| parent | 47eb4c689073eddc082007255564e1d3e142b727 | commitdiff |
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
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