darcs
Darcs.Resolution
standardResolution :: RepoPatch p => FL p -> Sealed (FL (PrimOf p))
externalResolution
Arguments
external merge tool command
command line arguments
patchsetConflictResolutions :: RepoPatch p => PatchSet p -> Sealed (FL (PrimOf p))