mergetools / vimdiff3on commit docs/config: avoid the term "expand" for includes (a076df2)
   1. "$MERGE_TOOLS_DIR/vimdiff"