Safe Haskell | Safe-Inferred |
---|
An implementation of a 3-way merge algorithm.
- data Hunk a
- = ChangedInA [a]
- | ChangedInB [a]
- | Both [a]
- | Conflict [a] [a] [a]
- diff3 :: Eq a => [a] -> [a] -> [a] -> [Hunk a]
Documentation
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.
ChangedInA [a] | |
ChangedInB [a] | |
Both [a] | |
Conflict [a] [a] [a] |