Darcs.Resolution

standardResolution

externalResolution

patchsetConflictResolutions