Darcs.Repository.Resolution
standardResolution
externalResolution
patchsetConflictResolutions