actually there is only one which does: amend-record I prefer resolve, but if it must be mark-conflicts, then it should be markconflicts, and ammed-record should be amendrecord :)
_______________________________________________ darcs-users mailing list [email protected] http://www.abridgegame.org/mailman/listinfo/darcs-users
