idea工具解决git冲突合并代码merge点击merge conflicts resolve弹出can't show merge in external tool 窗口报错Executable is

解决办法：setting ==》Tools ==》 Diff & Merge ==》External Diff Tools 把 下面两个对勾取消掉 ...