darcs-beta-2.7.98.3: a distributed, interactive, smart revision control system
Darcs.Resolution
standardResolution :: RepoPatch p => FL p x y -> Sealed (FL (PrimOf p) y)Source
externalResolution :: forall p x y z a. (RepoPatch p, ApplyState p ~ Tree) => Tree IO -> String -> FL (PrimOf p) x y -> FL (PrimOf p) x z -> FL p y a -> IO (Sealed (FL (PrimOf p) a))Source
patchsetConflictResolutions :: RepoPatch p => PatchSet p Origin x -> Sealed (FL (PrimOf p) x)Source