Merge branch 'wip/8-8-ghci' of gitlab.haskell.org:ghc/ghc into wip/ghc-8.8-merges
authorBen Gamari <ben@smart-cactus.org>
Tue, 4 Jun 2019 22:06:59 +0000 (18:06 -0400)
committerBen Gamari <ben@smart-cactus.org>
Tue, 4 Jun 2019 22:06:59 +0000 (18:06 -0400)
1  2 
compiler/main/GhcMake.hs
compiler/utils/StringBuffer.hs

Simple merge
Simple merge