mergetools / vimdiff2on commit Merge branch 'js/re-running-failed-tests' (ecc486b)
   1. "$MERGE_TOOLS_DIR/vimdiff"