quark added a comment. Sorry, did a wrong merge resolution. Will fix soon. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D654 To: quark, #hg-reviewers, durham, yuja Cc: yuja, mercurial-devel