mergetools / vimdiff2on commit unpack-trees: fix grammar for untracked files in directories (584f99c)
   1. "$MERGE_TOOLS_DIR/vimdiff"