| Safe Haskell | None |
|---|---|
| Language | Haskell2010 |
Darcs.Repository.Resolution
Documentation
standardResolution :: (Commute p, PrimPatchBase p, Conflict p) => RL (PatchInfoAnd rt p) wO wX -> RL (PatchInfoAnd rt p) wX wY -> StandardResolution (PrimOf p) wY Source #
Arguments
| :: (RepoPatch p, ApplyState p ~ Tree) | |
| => DiffAlgorithm | |
| -> Tree IO | working tree |
| -> String | external merge tool command |
| -> WantGuiPause | tell whether we want GUI pause |
| -> FL (PrimOf p) wX wY | our effect |
| -> FL (PrimOf p) wX wZ | their effect |
| -> FL p wY wA | them merged (standard_resolution) |
| -> IO (Sealed (FL (PrimOf p) wA)) |
patchsetConflictResolutions :: RepoPatch p => PatchSet rt p Origin wX -> StandardResolution (PrimOf p) wX Source #
data StandardResolution prim wX Source #
Constructors
| StandardResolution | |
Fields
| |
announceConflicts :: PrimPatch prim => String -> AllowConflicts -> ExternalMerge -> StandardResolution prim wX -> IO Bool Source #
warnUnmangled :: PrimPatch prim => StandardResolution prim wX -> IO () Source #
showUnmangled :: PrimPatch prim => [Unravelled prim wX] -> Doc Source #
showUnravelled :: PrimPatch prim => Doc -> Unravelled prim wX -> Doc Source #