Fix issue #1022: version_keyword should override infer_version when config differs#1174

RonnyPfannschmidt merged 2 commits intopypa:mainpypa/setuptools-scm:mainfrom

RonnyPfannschmidt:fix-1022-unittest-integration-orderRonnyPfannschmidt/setuptools_scm:fix-1022-unittest-integration-orderCopy head branch name to clipboard