[commit: packages/containers] cleaned_bugfix394, master, merge-doc-target, merge-fixes-5.9, merge-restrict-fix-5.8, revert-408-bugfix_394: Merge pull request #319 from treeowl/generalMerge2 (e268e62)

[git at git.haskell.org]

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

On branches: cleaned_bugfix394,master,merge-doc-target,merge-fixes-5.9,merge-restrict-fix-5.8,revert-408-bugfix_394
Link       : http://git.haskell.org/packages/containers.git/commitdiff/e268e62fcc45dc37742d9f5c9ca1b95f96e38661

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

commit e268e62fcc45dc37742d9f5c9ca1b95f96e38661
Merge: 96a2e22 9fc8b45
Author: David Feuer <David.Feuer at gmail.com>
Date:   Thu Aug 25 16:13:02 2016 -0400

    Merge pull request #319 from treeowl/generalMerge2
    
    Add general merge functions for maps



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

e268e62fcc45dc37742d9f5c9ca1b95f96e38661
 Data/IntMap/Base.hs                        |   15 +
 Data/IntSet/Base.hs                        |   15 +
 Data/Map.hs                                |    8 +-
 Data/Map/Base.hs                           |  731 ++++-
 Data/Map/Lazy.hs                           |   17 +-
 Data/Map/Lazy/Merge.hs                     |  103 +
 Data/Map/Strict.hs                         | 1250 +--------
 Data/Map/{Strict.hs => Strict/Internal.hs} |  403 ++-
 Data/Map/Strict/Merge.hs                   |   99 +
 Data/Sequence.hs                           | 4120 +---------------------------
 Data/{Sequence.hs => Sequence/Base.hs}     |   30 +-
 Data/Set.hs                                |    8 +-
 Data/Set/Base.hs                           |   19 +-
 Data/Utils/BitQueue.hs                     |   16 +
 Data/Utils/BitUtil.hs                      |   13 +
 Data/Utils/PtrEquality.hs                  |   30 +-
 Data/Utils/StrictFold.hs                   |   13 +
 Data/Utils/StrictMaybe.hs                  |   15 +
 Data/Utils/StrictPair.hs                   |   16 +
 changelog.md                               |    7 +
 containers.cabal                           |   15 +-
 tests/map-properties.hs                    |   27 +-
 tests/seq-properties.hs                    |    2 +-
 23 files changed, 1446 insertions(+), 5526 deletions(-)