D4035: resolve: add option to warn/abort on -m with unresolved conflict markers

pulkit (Pulkit Goyal) phabricator at mercurial-scm.org
Wed Aug 1 16:53:22 EDT 2018


pulkit added subscribers: khanchi97, pulkit.
pulkit added a comment.


  I like the idea here. @khanchi97 is already working on adding --confirm to `hg resolve`, how about having something like `hg resolve --mark --confirm` which asks you before marking each file as resolved?

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D4035

To: spectral, #hg-reviewers
Cc: pulkit, khanchi97, mercurial-devel


More information about the Mercurial-devel mailing list