martinvonz added a comment.
I was worried that the new version might be crashing in some cases (I specifically worried about indexes out of range in the `state` list). To test that, I added `hg debugmergestate` before every `hg resolve` call in the test suite. That showed two different bugs. Feel free to de-queue this patch or I'll send updates later (maybe tomorrow). Sorry that I didn't think to test that before the patch got accepted. REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D8113/new/ REVISION DETAIL https://phab.mercurial-scm.org/D8113 To: martinvonz, #hg-reviewers, durin42, pulkit Cc: pulkit, durin42, mercurial-devel _______________________________________________ Mercurial-devel mailing list Mercurialemail@example.com https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel