diff -r f9a82b9b2c36 -r 113a30b87716 mercurial/cext/manifest.c --- a/mercurial/cext/manifest.c Fri Jan 26 11:42:47 2018 -0800 +++ b/mercurial/cext/manifest.c Tue Jan 30 20:32:48 2018 -0800 @@ -778,11 +778,11 @@ PyObject *outer; /* If we're looking at a deleted entry and it's not * the end of the manifest, just skip it. */ - if (left->deleted && sneedle < self->numlines) { + if (sneedle < self->numlines && left->deleted) { sneedle++; continue; } - if (right->deleted && oneedle < other->numlines) { + if (oneedle < other->numlines && right->deleted) { oneedle++; continue; }