darcs-2.8.4: a distributed, interactive, smart revision control system

Portabilityportable
Stabilityexperimental
Maintainerdarcs-devel@darcs.net
Safe HaskellNone

Darcs.Patch.Merge

Description

 

Synopsis

Documentation

class Commute p => Merge p where

Things that can always be merged

Methods

merge :: (p :\/: p) x y -> (p :/\: p) x y

Instances

(Commute (RL p), Merge p) => Merge (RL p) 
(Commute (FL p), Merge p) => Merge (FL p) 
(Commute (Patch prim), PrimPatch prim) => Merge (Patch prim) 
(Commute (Named p), Merge p) => Merge (Named p) 
(Commute (PatchInfoAnd p), Merge p) => Merge (PatchInfoAnd p) 
(Commute (PatchChoice p), Merge p) => Merge (PatchChoice p) 
(Commute (TaggedPatch p), Merge p) => Merge (TaggedPatch p) 
(Commute (RealPatch prim), PrimPatch prim) => Merge (RealPatch prim) 

mergeFL :: Merge p => (p :\/: FL p) x y -> (FL p :/\: p) x y