mergetools / vimdiff2on commit convert add_files_to_cache to take struct pathspec (3efe8e4)
   1. "$MERGE_TOOLS_DIR/vimdiff"