Visual Studio 2017 中的Git原始碼控制中使用BeyondCompare 3
VS中如果source control選擇git, 則並沒有在vs中整合類似TFS的更改UI。需要到git的config檔案中去手動更改。
1. git全域性config。
路徑在C:\Users\本地賬號\.gitconfig, 開啟後更改為:
[diff]
tool = beyondcompare
[difftool]
prompt = true
[difftool "beyondcompare"]
cmd = \"C:\\Program Files (x86)\\Beyond Compare 3\\BComp.exe\" \"$LOCAL\" \"$REMOTE\"
keepBackup = false
[merge]
tool = beyondcompare
[mergetool]
prompt = true
[mergetool "beyondcompare"]
cmd = \"C:\\Program Files (x86)\\Beyond Compare 3\\BComp.exe\" \"$REMOTE\" \"$LOCAL\" \"$BASE\" \"$MERGED\"
keepBackup = false
trustExitCode = true
VS中的git設定的UI顯示效果為:
2. git庫下的config檔案更改,
路徑在庫資料夾下的\.git\config, 開啟後同樣更改為:
[diff]
tool = beyondcompare
[difftool]
prompt = true
[difftool "beyondcompare"]
cmd = \"C:\\Program Files (x86)\\Beyond Compare 3\\BComp.exe\" \"$LOCAL\" \"$REMOTE\"
keepBackup = false
[merge]
tool = beyondcompare
[mergetool]
prompt = true
[mergetool "beyondcompare"]
cmd = \"C:\\Program Files (x86)\\Beyond Compare 3\\BComp.exe\" \"$REMOTE\" \"$LOCAL\" \"$BASE\" \"$MERGED\"
keepBackup = false
trustExitCode = true
VS中的儲存庫的設定的UI效果為: