[commit: Cabal] master: provide more info about conflicts (8eaa33a)

[Ian Lynagh]

Repository : ssh://darcs.haskell.org//srv/darcs/packages/Cabal

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/8eaa33a81119ee07b95f86e8a73530c9c54b0b9d

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

commit 8eaa33a81119ee07b95f86e8a73530c9c54b0b9d
Author: Andres Loeh <andres at well-typed.com>
Date:   Mon Jun 20 13:04:53 2011 +0000

    provide more info about conflicts

 .../Client/Dependency/Modular/Assignment.hs        |   19 ++++----
 .../Client/Dependency/Modular/Dependency.hs        |   38 +++++++++-----
 .../Client/Dependency/Modular/Solver.hs            |   51 +-------------------
 .../Client/Dependency/Modular/Validate.hs          |   17 ++-----
 4 files changed, 39 insertions(+), 86 deletions(-)


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

    git show 8eaa33a81119ee07b95f86e8a73530c9c54b0b9d