Merge pull request #5296 from scpeters/bottle_version_scheme
dev-cmd/bottle: recognize version_scheme in merge
This commit is contained in:
commit
984bdebb47
@ -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
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user