darcs-2.12.5: a distributed, interactive, smart revision control system
Darcs.Patch.Merge
Description
Synopsis
class Commute p => Merge p where #
Things that can always be merged
Minimal complete definition
merge
Methods
merge :: (p :\/: p) wX wY -> (p :/\: p) wX wY #
Instances
merge :: (DummyPatch :\/: DummyPatch) wX wY -> (DummyPatch :/\: DummyPatch) wX wY #
merge :: (RL p :\/: RL p) wX wY -> (RL p :/\: RL p) wX wY #
merge :: (FL p :\/: FL p) wX wY -> (FL p :/\: FL p) wX wY #
merge :: (Named p :\/: Named p) wX wY -> (Named p :/\: Named p) wX wY #
merge :: (RepoPatchV2 prim :\/: RepoPatchV2 prim) wX wY -> (RepoPatchV2 prim :/\: RepoPatchV2 prim) wX wY #
merge :: (LabelledPatch p :\/: LabelledPatch p) wX wY -> (LabelledPatch p :/\: LabelledPatch p) wX wY #
merge :: (WrappedNamed rt p :\/: WrappedNamed rt p) wX wY -> (WrappedNamed rt p :/\: WrappedNamed rt p) wX wY #
merge :: (PatchInfoAnd rt p :\/: PatchInfoAnd rt p) wX wY -> (PatchInfoAnd rt p :/\: PatchInfoAnd rt p) wX wY #
selfMerger :: Merge p => MergeFn p p #
mergeFL :: Merge p => (p :\/: FL p) wX wY -> (FL p :/\: p) wX wY #