Idea增加Idiff merger工具

File -- setting --- tolls -- diff & merge

 选择使用外部diff工具和外部merge工具，选择winmerge工具目录。

就可以再version control 中选择已编辑文件，右键show diff。选择show diff in external tool