mergetools / gvimdiff2on commit Merge branch 'js/push-to-deploy' (72ecc6e)
   1. "$MERGE_TOOLS_DIR/vimdiff"