Support new TortoiseGit merge tool name