Darcs.Patch.Merge

Documentation

class Commute p => Merge p where

Things that can always be merged

Methods

merge :: (p :\/: p) wX wY -> (p :/\: p) wX wY

Instances

Merge DummyPatch

Merge p => Merge (RL p)

Merge p => Merge (FL p)

(Merge p, NameHack p) => Merge (Named p)

PrimPatch prim => Merge (Patch prim)

PrimPatch prim => Merge (RealPatch prim)

(Merge p, NameHack p) => Merge (PatchInfoAnd p)

(PrimPatchBase p, FromPrim p, Effect p, Invert p, Merge p) => Merge (Rebasing p)

Merge p => Merge (LabelledPatch p)

selfMerger :: Merge p => MergeFn p p

mergeFL :: Merge p => (p :\/: FL p) wX wY -> (FL p :/\: p) wX wY