来源：https://stackoverflow.com/questions/19113810/is-there-a-way-to-force-git-merge-to-always-use-an-external-merge-tool 标签 git git-config semantic-merge
