mirror of
https://github.com/ElementsProject/elements.git
synced 2026-08-16 13:01:19 +02:00
Merge 11f68cc810 into merged_master (Bitcoin PR bitcoin/bitcoin#31212)
This commit is contained in:
commit
5eec58e762
16 changed files with 210 additions and 75 deletions
|
|
@ -50,11 +50,11 @@ static int AppInitUtil(ArgsManager& args, int argc, char* argv[])
|
|||
return EXIT_FAILURE;
|
||||
}
|
||||
|
||||
if (HelpRequested(args) || args.IsArgSet("-version")) {
|
||||
if (HelpRequested(args) || args.GetBoolArg("-version", false)) {
|
||||
// First part of help message is specific to this utility
|
||||
std::string strUsage = CLIENT_NAME " bitcoin-util utility version " + FormatFullVersion() + "\n";
|
||||
|
||||
if (args.IsArgSet("-version")) {
|
||||
if (args.GetBoolArg("-version", false)) {
|
||||
strUsage += FormatParagraph(LicenseInfo());
|
||||
} else {
|
||||
strUsage += "\n"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue