Adding webstorm as diff and mergetool