配置diff工具:
git config --global diff.tool bc3
git config --global difftool.bc3.path "c:\Beyond compare 3\BComp.exe"
配置merge工具:
git config --global merge.tool bc3
git config --global mergetool.bc3.path "c:\Beyond compare 3\BComp.exe"
开始merge
git merge mybranch
git mergetool
网友评论