- added verbosity setting

- made conflictsuffix configurable

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

mercurial