Ricky

链接

RSS

RSS Link
搭建环境遇到的一系列问题
root用户登录DSM

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

Ricky posted @ 2017年9月18日 16:11 in Other , 265 阅读
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

 


登录 *


loading captcha image...
(输入验证码)
or Ctrl+Enter