HomePhabricator

tweakdefaults: make hg resolve require --re-merge flag to re-merge

Description

tweakdefaults: make hg resolve require --re-merge flag to re-merge

Pulkit suggested it in https://phab.mercurial-scm.org/D4379, and a
discussion with Octobus people reminded me that people still use the
error-prone default behavior of hg resolve.

Differential Revision: https://phab.mercurial-scm.org/D6610