darcs-beta-2.4.99.1: a distributed, interactive, smart revision control system

Darcs.Commands.MarkConflicts

Synopsis

Documentation

resolve :: DarcsCommandSource

resolve is an alias for mark-conflicts.