Recognize .sjs files as javascript
Some merge/diff releated tweaks