pulkit added inline comments. INLINE COMMENTS
> config.txt:452 > + ``abort`` will output the same warning but will not mark things as > resolved. > + If this is set to ``abort``, :hg:`resolve --mark --all` will bypass the > + error and still mark everything as resolved. I think here you mean 'none'? REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D4071 To: spectral, #hg-reviewers Cc: pulkit, mercurial-devel _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
