mergetools / vimdiff2on commit repack: simplify handling of auto-bitmaps and .keep files (7ff024e)
   1. "$MERGE_TOOLS_DIR/vimdiff"