Fix the git merge tool path.