参考文章https://www.cnblogs.com/yoyo-sincerely/p/8879514.html
运行以下命令
git config merge.tool vimdiff
git config merge.conflictstyle diff3
git config mergetool.prompt false
参考文章https://www.cnblogs.com/yoyo-sincerely/p/8879514.html
运行以下命令
git config merge.tool vimdiff
git config merge.conflictstyle diff3
git config mergetool.prompt false