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

[spectral (Kyle Lippincott)]

spectral added a comment.


  In https://phab.mercurial-scm.org/D4035#62660, @pulkit wrote:
  
  > Also, even though this is experimental, can we document it somewhere?
  
  
  Sure, any advice for where would be a good place to do that?  I would have thought `mercurial/help/config.txt`, but there's nothing in there about experimental options right now.
  
  I'm also fine skipping a prolonged 'experimental' phase and moving out of experimental now/soon.  I generally default to starting things in experimental, but maybe I shouldn't be doing that, and just land things like this completely to start with? :)

REPOSITORY
  rHG Mercurial

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

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