[commit: ghc] master: Fix broken colours with `-j` (#484) (fdc35b1)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/fdc35b1859c5b0781f26bb8b1754f4087f2afdbd/ghc

>---------------------------------------------------------------

commit fdc35b1859c5b0781f26bb8b1754f4087f2afdbd
Author: Patrick Dougherty <patrick.doc at ameritech.net>
Date:   Sat Dec 16 20:25:50 2017 -0600

    Fix broken colours with `-j` (#484)
    
    * Fix colours
    
    * Simplify data types
    
    * Fix doc typo


>---------------------------------------------------------------

fdc35b1859c5b0781f26bb8b1754f4087f2afdbd
 README.md                |  2 +-
 circle.yml               |  2 +-
 doc/user-settings.md     | 15 +++++++--
 hadrian.cabal            |  1 -
 src/Hadrian/Utilities.hs | 87 +++++++++++++++++++++++++++++++++++++-----------
 src/UserSettings.hs      |  5 ++-
 6 files changed, 85 insertions(+), 27 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc fdc35b1859c5b0781f26bb8b1754f4087f2afdbd