我已经关注了一些教程和帖子,但似乎仍然无效。甚至可以在Windows上将VS2013设置为git的默认合并/差异工具吗?
配置
[mergetool "vs13"]
cmd = "C:\\Program Files (x86)\\Microsoft Visual Studio 12.0\\Common7\\IDE\\vsDiffMerge.exe" "$LOCAL" "$REMOTE" //t
[difftool "vs13"]
cmd = "C:\\Program Files (x86)\\Microsoft Visual Studio 12.0\\Common7\\IDE\\vsDiffMerge.exe" "$REMOTE" "$LOCAL" "$BASE" "$MERGED" //m
[diff]
tool = vs13
[merge]
tool = vs13
输出
C:\Users\User\Documents\GitHub\testvisualstudio [master +0 ~1 -0]> git mergetool
No files need merging
C:\Users\User\Documents\GitHub\testvisualstudio [master +0 ~1 -0]> git difftool
/usr/libexec/git-core/git-mergetool--lib: eval: line 122: syntax error near unexpected token `('
/usr/libexec/git-core/git-mergetool--lib: eval: line 122: `C:\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\I
DE\vsDiffMerge.exe $REMOTE $LOCAL $BASE $MERGED //m'