配置TortoiseGit为git merge/diff tool

#设置prompt backup
git config --global difftool.prompt false
git config --global mergetool.prompt false
git config --global mergetool.keepBackup false

#tortoise

#通过命令行设置git merge tool tortoisemerge
git config --global merge.tool tortoisemerge
git config --global mergetool.tortoisemerge.path "C:\Program Files\TortoiseGit\bin\TortoiseGitMerge.exe" #可不设置

#通过命令行设置git difftool
#TortoiseGitMerge BaseFilePath MyFilePath [ TheirFilePath ]
git config --global diff.tool tortoisediff
git config --global difftool.tortoisediff.cmd "TortoiseGitMerge \$LOCAL \$REMOTE"
git config --global difftool.tortoisediff.path "C:\Program Files\TortoiseGit\bin\TortoiseGitMerge.exe" #可不设置