[commit: ghc] wip/nfs-locking: Add -/- for combining paths with unification of the result. (179d1cd)

[git at git.haskell.org]

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

On branch  : wip/nfs-locking
Link       : http://ghc.haskell.org/trac/ghc/changeset/179d1cd8a9dbaa304f51bef9cfbba745940ec2db/ghc

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

commit 179d1cd8a9dbaa304f51bef9cfbba745940ec2db
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Fri Jul 24 13:10:57 2015 +0100

    Add -/- for combining paths with unification of the result.


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

179d1cd8a9dbaa304f51bef9cfbba745940ec2db
 src/Oracles/Base.hs             |  8 +++-----
 src/Oracles/PackageData.hs      | 11 +++++------
 src/Package.hs                  |  2 +-
 src/Rules.hs                    |  4 ++--
 src/Rules/Config.hs             |  6 +++---
 src/Rules/Data.hs               | 12 ++++++------
 src/Settings/GhcCabal.hs        |  8 ++++----
 src/Settings/GhcM.hs            | 20 ++++++++++----------
 src/Settings/GhcPkg.hs          |  4 ++--
 src/Settings/TargetDirectory.hs |  4 ++--
 src/Settings/Util.hs            |  7 +------
 src/Util.hs                     |  9 ++++++++-
 12 files changed, 47 insertions(+), 48 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 179d1cd8a9dbaa304f51bef9cfbba745940ec2db