darcs-2.18.1: a distributed, interactive, smart revision control system
Safe HaskellSafe-Inferred
LanguageHaskell2010

Darcs.Repository.Resolution

Synopsis

Documentation

rebaseResolution :: (Conflict p, PrimPatch (PrimOf p)) => RL (PatchInfoAnd p) wO wX -> RL (Named p) wX wY -> StandardResolution (PrimOf p) wY Source #

Like standardResolution but it doesn't use the instance (Named p) because the traling list of patches may contain "fake" conflictors.

externalResolution Source #

Arguments

:: forall p wX wY wZ wA. (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

-> IO (Sealed (FL (PrimOf p) wA)) 

data StandardResolution prim wX Source #

Constructors

StandardResolution 

Fields

showUnravelled :: PrimPatch prim => Doc -> Unravelled prim wX -> Doc Source #