Darcs.Resolution
standard_resolution
external_resolution
patchset_conflict_resolutions