git merge tool setting
1.直接修改配置文件.gitconfig[user] name = *** email = ***@qq.com[credential] helper = manager[merge] tool = tortoisemerge[mergetool] keepBackup = false[mergetool "tortoisemerge"] ...
