mergetools / vimdiff2on commit Merge branch 'rs/qsort-s' into maint (4bf90c1)
   1. "$MERGE_TOOLS_DIR/vimdiff"