mergetools / vimdiff2on commit Merge branch 'js/exec-path-coverity-workaround' into maint (21a9002)
   1. "$MERGE_TOOLS_DIR/vimdiff"