]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e867110 47eb4c6)
Merge branch 'ms/mergetools-kdiff3-on-windows'
authorJunio C Hamano <gitster@pobox.com>
Thu, 8 Jul 2021 20:15:04 +0000 (13:15 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 8 Jul 2021 20:15:04 +0000 (13:15 -0700)
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


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.