darcs-beta-2.7.99.1: a distributed, interactive, smart revision control system
Darcs.Resolution
standardResolution :: RepoPatch p => FL p x y -> Sealed (FL (PrimOf p) y)Source
externalResolutionSource
Arguments
external merge tool command
command line arguments
patchsetConflictResolutions :: RepoPatch p => PatchSet p Origin x -> Sealed (FL (PrimOf p) x)Source