-- Hoogle documentation, generated by Haddock -- See Hoogle, http://www.haskell.org/hoogle/ -- | Perform a 3-way difference of documents -- -- Perform a 3-way difference of documents @package diff3 @version 0.1.0.0 -- | An implementation of a 3-way merge algorithm. module Data.Algorithm.Diff3 -- | A hunk is a collection of changes that occur in a document. A hunk can -- be some changes only in A, only in B, in both A & B (equally), or -- conflicting between A, B and the original document. data Hunk a ChangedInA :: [a] -> Hunk a ChangedInB :: [a] -> Hunk a Both :: [a] -> Hunk a Conflict :: [a] -> [a] -> [a] -> Hunk a -- | Perform a 3-way diff against 2 documents and the original document. diff3 :: Eq a => [a] -> [a] -> [a] -> [Hunk a] instance Eq a => Eq (Hunk a) instance Show a => Show (Hunk a)