mergetools / gvimdiffon commit Merge branch 'rs/archive-zip-many' into maint (1c82039)
   1. "$MERGE_TOOLS_DIR/vimdiff"