difftool:
[diff] tool = bc4 algorithm = histogram [difftool] prompt = false [difftool "bc4"] cmd = "D:/Program Files/beyond compare/BComp.exe" "$LOCAL" "$REMOTE"
mergetool: (Git中未生效, GitHub destop中生效)
[merge] tool = bc4 [mergetool] prompt = false keepBackup = false [mergetool "bc4"] cmd = "D:/Program Files/beyond compare/BComp.exe" "$LOCAL" "$REMOTE" "$BASE" "$MERGED" trustExitCode = true
editor:
[core] editor = "D:/Program Files/Sublime Text 3/sublime_text.exe" -w