mergetools / vimdiff3on commit Merge branch 'sb/t4005-modernize' into maint (dbcf775)
   1. "$MERGE_TOOLS_DIR/vimdiff"