Merge branch 'master' into find-minimal-conflict-set (76adde44) · Commits · Glasgow Haskell Compiler / Packages / Cabal · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

C

Cabal
- Activity
- Members
- Environments
- Terraform modules

Snippets Groups Projects

76adde44

Unverified Commit 76adde44 authored 6 years ago by Mikhail Glushenkov Committed by GitHub 6 years ago

Downloads
- Plain Diff

Merge branch 'master' into find-minimal-conflict-set

parents b1d629e2 c25a2233

No related branches found

No related tags found

No related merge requests found

Changes 14

Hide whitespace changes

Inline Side-by-side

Showing

Cabal/ChangeLog.md 1 addition, 0 deletions

Cabal/ChangeLog.md
Cabal/Distribution/Simple.hs 4 additions, 1 deletion

Cabal/Distribution/Simple.hs
Cabal/Distribution/Simple/PreProcess.hs 4 additions, 2 deletions

Cabal/Distribution/Simple/PreProcess.hs
Cabal/Distribution/Simple/Program/Find.hs 10 additions, 1 deletion

Cabal/Distribution/Simple/Program/Find.hs
Cabal/Distribution/Simple/Setup.hs 6 additions, 0 deletions

Cabal/Distribution/Simple/Setup.hs
cabal-install/Distribution/Client/CmdTest.hs 26 additions, 5 deletions

cabal-install/Distribution/Client/CmdTest.hs
cabal-install/Distribution/Client/Config.hs 1 addition, 0 deletions

cabal-install/Distribution/Client/Config.hs
cabal-install/Distribution/Client/ProjectConfig/Legacy.hs 3 additions, 1 deletion

cabal-install/Distribution/Client/ProjectConfig/Legacy.hs
cabal-install/Distribution/Client/ProjectConfig/Types.hs 1 addition, 0 deletions

cabal-install/Distribution/Client/ProjectConfig/Types.hs
cabal-install/Distribution/Client/ProjectPlanning.hs 2 additions, 0 deletions

cabal-install/Distribution/Client/ProjectPlanning.hs
cabal-install/Distribution/Client/ProjectPlanning/Types.hs 1 addition, 0 deletions

cabal-install/Distribution/Client/ProjectPlanning/Types.hs
cabal-install/Distribution/Client/Setup.hs 1 addition, 1 deletion

cabal-install/Distribution/Client/Setup.hs
cabal-install/changelog 1 addition, 0 deletions

cabal-install/changelog
cabal-install/tests/UnitTests/Distribution/Client/ProjectConfig.hs 9 additions, 6 deletions

...tall/tests/UnitTests/Distribution/Client/ProjectConfig.hs

with 70 additions and 17 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment