Merge pull request #12423 from ethereum/develop

Merge develop into breaking.
This commit is contained in:
chriseth
2021-12-20 11:40:40 +01:00
committed by GitHub
77 changed files with 3206 additions and 592 deletions
+1 -1
View File
@@ -158,7 +158,7 @@ BOOST_AUTO_TEST_CASE(multiple_input_modes)
};
string expectedMessage =
"The following options are mutually exclusive: "
"--help, --license, --version, --standard-json, --link, --assemble, --strict-assembly, --yul, --import-ast. "
"--help, --license, --version, --standard-json, --link, --assemble, --strict-assembly, --yul, --import-ast, --lsp. "
"Select at most one.";
for (string const& mode1: inputModeOptions)