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
Original issue reported on code.google.com by stepan.h...@gmail.com on 30 May 2015 at 1:07
Original issue reported on code.google.com by
stepan.h...@gmail.com
on 30 May 2015 at 1:07