diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-07-08 13:15:04 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-07-08 13:15:04 -0700 |
| commit | b7bd70ddd4d38b16a1af6975df8077306ee998da (patch) | |
| tree | 070e538c7e1a6c9e750a96b66eb293678309c03c /contrib/persistent-https | |
| parent | e867110340c236d2ba977d2c4bf1274a297f4e21 (diff) | |
| parent | 47eb4c689073eddc082007255564e1d3e142b727 (diff) | |
| download | git-b7bd70ddd4d38b16a1af6975df8077306ee998da.tar.gz git-b7bd70ddd4d38b16a1af6975df8077306ee998da.zip | |
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
Diffstat (limited to 'contrib/persistent-https')
0 files changed, 0 insertions, 0 deletions