darcs
Darcs.Commands.MarkConflicts
Synopsis
markconflicts :: DarcsCommand
resolve :: DarcsCommand
resolve is an alias for mark-conflicts.