Conflicting custom arguments bugfix #12824#13393

annatasio wants to merge 3 commits intopytest-dev:mainpytest-dev/pytest:mainfrom

annatasio:conflicting_custom_arguments_bugfixannatasio/pytest:conflicting_custom_arguments_bugfixCopy head branch name to clipboard