From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 8 Jul 2021 20:15:04 +0000 (-0700)
Subject: Merge branch 'ms/mergetools-kdiff3-on-windows'
X-Git-Tag: v2.33.0-rc0~78
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b7bd70ddd4d38b16a1af6975df8077306ee998da;p=thirdparty%2Fgit.git

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
---

b7bd70ddd4d38b16a1af6975df8077306ee998da