mergetools / gvimdiff2on commit Merge branch 'js/bundle-verify-require-object-store' into maint (abbd504)
   1. "$MERGE_TOOLS_DIR/vimdiff"