Is there a way to force git merge to always use an external merge tool? 阅读更多 关于 Is there a way to force git merge to always use an external merge tool? 来源： https://stackoverflow.com/questions/19113810/is-there-a-way-to-force-git-merge-to-always-use-an-external-merge-tool
