Visual Studio Code配置BC或者Merge代码比较合并

git config --global diff.tool araxis
git config --global mergetool.tool araxis
git config --global mergetool.araxis.path "d:/Program Files/Araxis/Araxis Merge/Compare.exe"

git config --global diff.tool bc
git config --global mergetool.tool bc
git config --global mergetool.bc.path "d:/program files/beyond compare 4/bcomp.exe"

;[diff]
;    tool = bc
;[difftool "bc"]
;    path = d:/program files/beyond compare 4/bcomp.exe
;[merge]
;    tool = bc
;[mergetool "bc"]
;    path = d:/program files/beyond compare 4/bcomp.exe
[diff]
tool = araxis
[difftool "araxis"]
    prompt = false
    path = d:/Program Files/Araxis/Araxis Merge/Compare.exe
[merge]
tool = araxis
[mergetool "araxis"]
path = d:/Program Files/Araxis/Araxis Merge/Compare.exe
[mergetool]
    prompt = false
tool = araxis

你可能感兴趣的:(Visual Studio Code配置BC或者Merge代码比较合并)