added usage info and some options

added conflict detection

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

mercurial