I installed latest versions of SourceTree (1.9.6.1) and TortoiseGit (2.2.0.0). Now when trying to resolve merge conflict using external tool, small window flashes quickly and TortoiseGitMerge window doesn't open. If I run SourceTree as administrator - everything works as expected (SourceTree settings and .gitconfig are identical in both cases). Is it possible to have it working for non-administrator account?
Update: I reinstalled old versions of TortoiseGit and SourceTree, and nothing changed, I still can launch TortoiseMerge as external merge tool only when I run SourceTree as administrator.