Merge branch 'ms/mergetools-kdiff3-on-windows' into seen
authorJunio C Hamano <gitster@pobox.com>
Sat, 19 Jun 2021 07:30:21 +0000 (16:30 +0900)
committerJunio C Hamano <gitster@pobox.com>
Sat, 19 Jun 2021 07:30:21 +0000 (16:30 +0900)
commitbb402f42b3ff1687ffffc022531a69cf7e18389e
treef6817d8208d3b66f02ae0d5cfdb667b35c630f9d
parentec7ccef0061f7a030cf3cd1cd04eafb50e4b52c3
parent47eb4c689073eddc082007255564e1d3e142b727
Merge branch 'ms/mergetools-kdiff3-on-windows' into seen

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