darcs-2.5.2: a distributed, interactive, smart revision control system

Darcs.Commands.MarkConflicts

Synopsis

Documentation

markconflicts :: DarcsCommand Source

resolve :: DarcsCommand Source

resolve is an alias for mark-conflicts.