darcs-2.16.4: a distributed, interactive, smart revision control system
Safe HaskellNone
LanguageHaskell2010

Darcs.Repository.Resolution

Documentation

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 (standard_resolution)

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

data StandardResolution prim wX Source #

Constructors

StandardResolution 

Fields

showUnmangled :: PrimPatch prim => [Unravelled prim wX] -> Doc Source #

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