版权声明:本文为博主原创文章,未经博主允许不得转载。 https://blog.csdn.net/m0_38031406/article/details/83618756
1.直接修改配置文件.gitconfig
[user]
name = ***
email = ***@qq.com
[credential]
helper = manager
[merge]
tool = tortoisemerge
[mergetool]
keepBackup = false
[mergetool "tortoisemerge"]
path = C:\\Program Files\\TortoiseSVN\\bin\\TortoiseMerge.exe
2.通过命令配置
git config --global merge.tool 查询当前merge tool名称
git config --global merge.tool tortoisemerge 设置mergetool名称
git config --global mergetool.tortoisemerge.path "C:\\Program Files\\TortoiseSVN\\bin\\TortoiseMerge.exe" 设置mergetool位置