windows下 git merge 整合bcompare3

以下是本人的.gitconfig配置：

[user]

name = wmj

email = [e-mail]

[color]

diff = auto

status = auto

branch =auto

interactive = true

ui = true

[alias]

co = checkout

ci = commit

st = status

br = branch

hist = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset' --abbrev-commit --date=relative

[core]

autocrlf = false

[merge]

tool = bc3

[diff]

tool = bc3

[difftool]

prompt = false

[difftool "bc3"]

cmd = "\"D:/app/BCompare3/BComp.exe\" \"$LOCAL\" \"$REMOTE\""

[merge]

tool = bc3

[mergetool]

prompt = false

[mergetool "bc3"]

cmd = "\"D:/app/BCompare3/BComp.exe\" \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\""