view tests/unwrap-message-id.py @ 48556:ce8c82a5cd65

simplemerge: convert `merge_lines()` away from generator

We always consume all the lines and put them in a list anyway. By
making the function not a generator, we can later make it return an
additional value (to indicate if there were conflicts).

Differential Revision: https://phab.mercurial-scm.org/D11973

from __future__ import absolute_import, print_function

import sys

for line in sys.stdin:
    if line.lower() in ("message-id: \n", "in-reply-to: \n"):
        line = line[:-2]
    print(line, end="")