equal
deleted
inserted
replaced
776 int result; |
776 int result; |
777 PyObject *key; |
777 PyObject *key; |
778 PyObject *outer; |
778 PyObject *outer; |
779 /* If we're looking at a deleted entry and it's not |
779 /* If we're looking at a deleted entry and it's not |
780 * the end of the manifest, just skip it. */ |
780 * the end of the manifest, just skip it. */ |
781 if (left->deleted && sneedle < self->numlines) { |
781 if (sneedle < self->numlines && left->deleted) { |
782 sneedle++; |
782 sneedle++; |
783 continue; |
783 continue; |
784 } |
784 } |
785 if (right->deleted && oneedle < other->numlines) { |
785 if (oneedle < other->numlines && right->deleted) { |
786 oneedle++; |
786 oneedle++; |
787 continue; |
787 continue; |
788 } |
788 } |
789 /* if we're at the end of either manifest, then we |
789 /* if we're at the end of either manifest, then we |
790 * know the remaining items are adds so we can skip |
790 * know the remaining items are adds so we can skip |