search

kaixuan1115 / notes

笔记收录
6 stars 0 forks source link

Git设置可视化比对工具 #18

Closed kaixuan1115 closed 5 years ago

kaixuan1115 commented 5 years ago 
git config --global diff.tool vdiff
git config --global difftool.vdiff.cmd "\"C:/Program Files/TortoiseSVN/bin/TortoiseMerge.exe\" \"$LOCAL\" \"$REMOTE\""

或者将下列内容加入.gitconfig

[diff]
tool = vdiff
[difftool "vdiff"]
cmd = \"C:/Program Files/TortoiseSVN/bin/TortoiseMerge.exe\" \"$LOCAL\" \"$REMOTE\"