diff uses wrong tool in case the filename matches a registered extension

By stepan.hr... on May 30, 2015 13:07 (imported from Google Code)

What steps will reproduce the problem?
1.Add file "doc" to repository.
2.Modify it.
3.Compare it with base.

What is the expected output? What do you see instead?
I expect TortoiseGitMerge, but LibreOffice is started instead.

What version of TortoiseGit and msysgit are you using? On
what operating system?
TortoiseGit 1.8.14.0, git version 1.9.5.msysgit.1, Windows 7 x64.

Please provide any additional information below.
This is patch for the same bug in TortoiseSVN:
http://sourceforge.net/p/tortoisesvn/code/22578

To upload designs, you'll need to enable LFS and have an admin enable hashed storage. More information