Merge pull request #5296 from scpeters/bottle_version_scheme

dev-cmd/bottle: recognize version_scheme in merge
This commit is contained in:
Steven Peters 2018-11-11 14:55:07 -08:00 committed by GitHub
commit 984bdebb47
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -540,7 +540,7 @@ module Homebrew
(\n^\ {3}[\S\ ]+$)* # options can be in multiple lines (\n^\ {3}[\S\ ]+$)* # options can be in multiple lines
)?| )?|
(homepage|desc|sha1|sha256|version|mirror)\ ['"][\S\ ]+['"]| # specs with a string (homepage|desc|sha1|sha256|version|mirror)\ ['"][\S\ ]+['"]| # specs with a string
revision\ \d+ # revision with a number (revision|version_scheme)\ \d+ # revision with a number
)\n+ # multiple empty lines )\n+ # multiple empty lines
)+ )+
/mx /mx