mergetools / vimdiff2on commit request-pull: test updates (28ad685)
   1. "$MERGE_TOOLS_DIR/vimdiff"