bitcoin/bitcoin — pull request #5229 by jtimon (2014-11-06 17:55:31+00:00)
Title: Generic chainparam selection with -network=<network>

Continues #4804.
Deprecate -testnet and -regtest in favor of -network=testnet and -network=regtest.
When the old args are used a warning will be logged.
The repetition of the invalid combination error string is also avoided.
Additionally, the chainparam networkID is removed since it's not used anymore (as it shouldn't).