[commit: packages/containers] cleaned_bugfix394, master, merge-doc-target, merge-fixes-5.9, revert-408-bugfix_394: Merge pull request #372 from wrengr/IntMapGeneralMerge (71c6474)

[git at git.haskell.org]

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

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

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

commit 71c64747120c3cd1b91f06731167009b0e5b2454
Merge: 30b0fe7 323f708
Author: wren romano <wren at community.haskell.org>
Date:   Mon Dec 19 11:15:55 2016 -0800

    Merge pull request #372 from wrengr/IntMapGeneralMerge
    
    IntMap general merge



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

71c64747120c3cd1b91f06731167009b0e5b2454
 Data/IntMap/Internal.hs              | 10 ++++++++++
 Data/{Map => IntMap}/Merge/Lazy.hs   | 10 +++++-----
 Data/{Map => IntMap}/Merge/Strict.hs | 10 +++++-----
 Data/Map/Merge/Lazy.hs               |  2 +-
 Data/Map/Merge/Strict.hs             |  2 +-
 containers.cabal                     |  2 ++
 6 files changed, 24 insertions(+), 12 deletions(-)