mergetools / vimdiff2on commit Merge branch 'nd/fetch-pack-error-reporting-fix' (40b7732)
   1. "$MERGE_TOOLS_DIR/vimdiff"