mergetools / vimdiff2on commit remote-testgit: move it into the support directory for t5801 (5afb2ce)
   1. "$MERGE_TOOLS_DIR/vimdiff"