我尝试在TortoiseGit的diff设置中为外部diff工具设置a:
C:\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\IDE\vsDiffMerge.exe %mine %base
但无用,也需要合并命令
供差异使用:
"C:\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\IDE\vsDiffMerge.exe" %base %mine /t
供合并使用:
"C:\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\IDE\vsDiffMerge.exe" /m /t %mine %theirs %base %merged