0%

Git设置git diff用Codecompare

Git配置

打开.gitconfig

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
[difftool "codecompare"]
cmd = \"C:\\Program Files\\Devart\\Code Compare\\CodeCompare.exe\" -W \"$LOCAL\" \"$REMOTE\"
renames = true

[diff]
tool = codecompare
guitool = codecompare
[mergetool "codecompare"]
cmd = \"C:\\Program Files\\Devart\\Code Compare\\CodeMerge.exe\" -MF \"$LOCAL\" -TF \"$REMOTE\" -BF \"$BASE\" -RF \"$MERGED\"
trustExitCode = true
[mergetool]
keepBackup = false
[merge]
tool = codecompare
guitool = codecompare