[master] Move handling of duplicate files#4286

blueyed wants to merge 1 commit intopytest-dev:masterpytest-dev/pytest:masterfrom

blueyed:move-duplicates-masterblueyed/pytest:move-duplicates-masterCopy head branch name to clipboard