配置beyondcompare合并git操作

git config --global merge.tool bc

git config --global mergetool.bc.path "C:/Program Files/Beyond Compare 5/BCompare.exe"

git config --global mergetool.bc.trustExitCode true

git config --global --list | Select-String -Pattern "merge"

merge.tool=bc

mergetool.bc.path=C:/Program Files/Beyond Compare 5/BCompare.exe

mergetool.bc.trustexitcode=true

git mergetool 或者git mergetool --tool=bc