mergetools / vimdiff2on commit Merge branch 'rs/pretty-add-again' into maint (4977117)
   1. "$MERGE_TOOLS_DIR/vimdiff"