Git 中使用 Beyond Compare 2 进行 diff 和 merge
配置 .gitconfig
C:\Users\Administrator 目录下。
[diff]
tool = bc2
[difftool]
prompt = true
[difftool "bc2"]
cmd = \"D:/Program Files (x86)/Beyond Compare 2/BC2.exe\" "$(cygpath -w $LOCAL)" "$REMOTE"
[merge]
tool = bc2
[mergetool]
prompt = true
[mergetool "bc2"]
#trustExitCode = true
cmd = \"D:/Program Files (x86)/Beyond Compare 2/BC2.exe\" "$LOCAL" "$REMOTE" "$BASE" "$MERGED"
git 中使用 git difftool、git mergetool 进行相关操作。