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

Portabilityportable
Stabilityexperimental
Maintainerdarcs-devel@darcs.net
Safe HaskellSafe-Infered

Darcs.Patch.Merge

Description

 

Synopsis

Documentation

class Commute p => Merge p whereSource

Things that can always be merged

Methods

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

Instances

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

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