mergetools / gvimdiff2on commit Merge branch 'sb/archive-zip-double-assignment-fix' into maint (509152d)
   1. "$MERGE_TOOLS_DIR/vimdiff"