mergetools / gvimdiff2on commit .gitignore: stop ignoring `.manifest` files (aac6ff7)
   1. "$MERGE_TOOLS_DIR/vimdiff"