[commit: packages/containers] cleaned_bugfix394, master, merge-doc-target, merge-fixes-5.9, revert-408-bugfix_394: Merge pull request #335 from treeowl/move-merge (4f70ddd)

[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/4f70dddee24e800e40318eb271193456d6e444ac

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

commit 4f70dddee24e800e40318eb271193456d6e444ac
Merge: 273578b cc0904d
Author: David Feuer <David.Feuer at gmail.com>
Date:   Mon Sep 5 15:04:26 2016 -0400

    Merge pull request #335 from treeowl/move-merge
    
    Rename merge modules



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

4f70dddee24e800e40318eb271193456d6e444ac
 Data/Map/Lazy/Merge.hs                        | 73 ++-------------------------
 Data/Map/{Lazy/Merge.hs => Merge/Lazy.hs}     |  4 +-
 Data/Map/{Strict/Merge.hs => Merge/Strict.hs} |  4 +-
 Data/Map/Strict/Merge.hs                      | 69 ++-----------------------
 containers.cabal                              |  2 +
 tests/map-properties.hs                       |  4 +-
 6 files changed, 18 insertions(+), 138 deletions(-)