darcs-2.11.0: 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) wX wY -> (p :/\: p) wX wY

Instances

Merge DummyPatch 
Merge p => Merge (RL p) 
Merge p => Merge (FL p) 
PrimPatch prim => Merge (RepoPatchV1 prim) 
Merge p => Merge (Named p) 
PrimPatch prim => Merge (RepoPatchV2 prim) 
Merge p => Merge (LabelledPatch p) 
Merge p => Merge (WrappedNamed rt p) 
Merge p => Merge (PatchInfoAnd rt p) 

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