Merge pull request #6257 from haskell/Diff-0.4

Cabal/Cabal.cabal

Cabal/Distribution/Backpack.hs

Cabal/Distribution/Backpack/ModSubst.hs

Cabal/Distribution/Backpack/ModuleShape.hs

Cabal/Distribution/Backpack/PreModuleShape.hs

Cabal/Distribution/Compat/Lens.hs

Cabal/Distribution/Compat/Prelude.hs

Cabal/Distribution/FieldGrammar/Class.hs

Cabal/Distribution/FieldGrammar/Parsec.hs

Cabal/Distribution/Fields/Pretty.hs

Cabal/Distribution/InstalledPackageInfo.hs

Cabal/Distribution/PackageDescription/Configuration.hs

Cabal/Distribution/Parsec.hs

Cabal/Distribution/Parsec/Newtypes.hs

Cabal/Distribution/Pretty.hs

Cabal/Distribution/Simple/Program/GHC.hs

Cabal/Distribution/Types/Dependency.hs

Cabal/Distribution/Types/DependencyMap.hs

Cabal/Distribution/Verbosity.hs

Cabal/tests/CheckTests.hs