equal
deleted
inserted
replaced
2822 while True: |
2822 while True: |
2823 if val1 is None: |
2823 if val1 is None: |
2824 val1 = iter1.next() |
2824 val1 = iter1.next() |
2825 if val2 is None: |
2825 if val2 is None: |
2826 val2 = iter2.next() |
2826 val2 = iter2.next() |
2827 next = choice(val1, val2) |
2827 n = choice(val1, val2) |
2828 yield next |
2828 yield n |
2829 if val1 == next: |
2829 if val1 == n: |
2830 val1 = None |
2830 val1 = None |
2831 if val2 == next: |
2831 if val2 == n: |
2832 val2 = None |
2832 val2 = None |
2833 except StopIteration: |
2833 except StopIteration: |
2834 # Flush any remaining values and consume the other one |
2834 # Flush any remaining values and consume the other one |
2835 it = iter2 |
2835 it = iter2 |
2836 if val1 is not None: |
2836 if val1 is not None: |