idea工具解決git沖突合並代碼merge點擊merge conflicts resolve彈出can't show merge in external tool 窗口報錯Executable is

解決辦法：setting ==》Tools ==》 Diff & Merge ==》External Diff Tools 把 下面兩個對勾取消掉 ...