Page MenuHomePhabricator

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

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

Details

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
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

pulkit accepted this revision.Sun, Jul 7, 2:20 PM
This revision is now accepted and ready to land.Sun, Jul 7, 2:20 PM