darcs-2.5.1: a distributed, interactive, smart revision control system
Darcs.Resolution
standardResolution :: RepoPatch p => p -> Sealed (FL Prim)Source
externalResolution :: RepoPatch p => Tree IO -> String -> FL Prim -> FL Prim -> p -> IO (Sealed (FL Prim))Source
patchsetConflictResolutions :: RepoPatch p => PatchSet p -> Sealed (FL Prim)Source