[commit: ghc] wip/orf-reboot: Very rough conflict resolution (32e5ce5)

[git at git.haskell.org]

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

On branch  : wip/orf-reboot
Link       : http://ghc.haskell.org/trac/ghc/changeset/32e5ce580b58295c5fd36ea44d858169c741a2b5/ghc

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

commit 32e5ce580b58295c5fd36ea44d858169c741a2b5
Author: Adam Gundry <adam at well-typed.com>
Date:   Fri Feb 20 10:19:18 2015 +0000

    Very rough conflict resolution


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

32e5ce580b58295c5fd36ea44d858169c741a2b5
 compiler/hsSyn/Convert.hs          |  31 +++-------
 compiler/hsSyn/HsDecls.hs          |   2 +-
 compiler/rename/RnSource.hs        |  72 ++---------------------
 compiler/rename/RnTypes.hs         |  66 ++++-----------------
 compiler/typecheck/TcPat.hs        |  26 ++-------
 compiler/typecheck/TcTyClsDecls.hs | 117 ++++++++-----------------------------
 6 files changed, 52 insertions(+), 262 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 32e5ce580b58295c5fd36ea44d858169c741a2b5