Beyond compare和Git 联合

Git 常用命令：

https://blog.csdn.net/weixin_41477306/article/details/103019244

安装破解步骤

1.下载beyond compare

链接：https://pan.baidu.com/s/1gHR5X4Bcgg_mfR9KnMQVqQ
提取码：gkpi

2.安装

默认下一步

3.破解

注册码

w4G-in5u3SH75RoB3VZIX8htiZgw4ELilwvPcHAIQWfwfXv5n0IHDp5hv
1BM3+H1XygMtiE0-JBgacjE9tz33sIh542EmsGs1yg638UxVfmWqNLqu-
Zw91XxNEiZF7DC7-iV1XbSfsgxI8Tvqr-ZMTxlGCJU+2YLveAc-YXs8ci
RTtssts7leEbJ979H5v+G0sw-FwP9bjvE4GCJ8oj+jtlp7wFmpVdzovEh
v5Vg3dMqhqTiQHKfmHjYbb0o5OUxq0jOWxg5NKim9dhCVF+avO6mDeRNc
OYpl7BatIcd6tsiwdhHKRnyGshyVEjSgRCRY11IgyvdRPnbW8UOVULuTE

4.与Git 联和使用

1.linux

在~/.gitconfig文件中增加：

[diff]
    tool = bc3
[difftool]
    prompt = false
[merge]
    tool = bc3
[mergetool]
    prompt = false

打开 C:\Users\Administrator.gitconfig
diff

[diff]
    tool = bc4
[difftool "bc4"]
    cmd = "\"c:/Program Files/Beyond Compare 4/BComp.exe\" \"$LOCAL\" \"$REMOTE\""

[merge]
    tool = bc4
[mergetool "bc4"]
    cmd = "\"c:/Program Files/Beyond Compare 4/BComp.exe\" \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\""