diff3 0.3.0 → 0.3.1

raw patch · 2 files changed

+2/−2 lines, 2 filesPVP ok

version bump matches the API change (PVP)

API changes (from Hackage documentation)

Files

diff3.cabal +1/−2
src/Data/Algorithm/Diff3.hs +1/−0

diff3.cabal view

@@ -1,5 +1,5 @@ name:                diff3-version:             0.3.0+version:             0.3.1 synopsis:            Perform a 3-way difference of documents homepage:            http://github.com/ocharles/diff3.git license:             BSD3@@ -11,7 +11,6 @@ cabal-version:       >=1.8 bug-reports: http://github.com/ocharles/diff3/issues copyright: Copyright (C) 2012 Oliver Charles-synopsis:            Perform a 3-way difference of documents  source-repository head   type: git

src/Data/Algorithm/Diff3.hs view

@@ -1,6 +1,7 @@ {-| An implementation of a 3-way merge algorithm. -} module Data.Algorithm.Diff3 (Hunk(..), diff3, merge) where +import Prelude hiding ((<>)) import Data.Algorithm.Diff import Data.Monoid (Monoid, mempty, mappend)