added resolve-conflicts and delete-conflicts to help text and fixed crash with unknown cmd options

automatically remove deleted conflict files from the db

added resolve-conflicts and delete-conflicts commands

(0) -100 -30 -10 -3 +3 +10 +30 +100 +300 tip

mercurial