mergetools / vimdiff2on commit sha1dc: update from upstream (23e37f8)
   1. "$MERGE_TOOLS_DIR/vimdiff"