pulkit added a comment.
Please add about this config option in the releasenotes page for 4.8 at https://www.mercurial-scm.org/wiki/Release4.8. INLINE COMMENTS > commands.py:4537 > > if all and confirm: > if ui.promptchoice(_(b're-merge all unresolved files (yn)?' This one should be moved after conditional in line 4544. Also we can now better organize the three if 'confirm' conditionals now. Can you please follow-up? REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D4102 To: khanchi97, #hg-reviewers, pulkit Cc: pulkit, mercurial-devel _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel