Add p4merge as mergetool
Settings for Javascript