mergetools / vimdiff2on commit Merge branch 'js/iterm-is-on-osx' (ed23f31)
   1. "$MERGE_TOOLS_DIR/vimdiff"