Tech&WK_projectManagement_sourceTree_beyondCompare

目的：source tree vcs and beyond compare

---

1. source Tree menu 

tool -> options -> diff

 

[user]
    name = cj
    email = gritsoul@hotmail.com
[difftool "sourcetree"]
    cmd = 'D:/software/Beyond Compare 4/BComp.exe' \"$LOCAL\" \"$REMOTE\"
[mergetool "sourcetree"]
    cmd = 'D:/software/Beyond Compare 4/BComp.exe' \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\"
    trustExitCode = true
    cmd = 'D:/software/Beyond Compare 4/BComp.exe' \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\" 

如果有 .orig 文件生成, 点击 “移除” 清理。

而后提交.

---

比较历史版本，选中两个版本，创建补丁：