mergetools / vimdiff3on commit convert: unify the "auto" handling of CRLF (6523728)
   1. "$MERGE_TOOLS_DIR/vimdiff"