This is an archive of the discontinued Mercurial Phabricator instance.

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

Authored by valentin.gatienbaron on Jul 7 2019, 12:09 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Summary

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.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped