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