Darcs.Commands.MarkConflicts
markconflicts
resolve