On branch mergify/bp/3.10/pr-9132
Your branch is up to date with 'origin/3.10'.

You are currently cherry-picking commit 4aa5f8861.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	new file:   cabal-testsuite/PackageTests/Regression/T9122/p/p.cabal
	new file:   cabal-testsuite/PackageTests/Regression/T9122/q/q.cabal
	new file:   cabal-testsuite/PackageTests/Regression/T9122/setup.cabal.out
	new file:   cabal-testsuite/PackageTests/Regression/T9122/setup.out
	new file:   cabal-testsuite/PackageTests/Regression/T9122/setup.test.hs
	new file:   changelog.d/issue-9122

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   Cabal/src/Distribution/PackageDescription/Check.hs