simplemerge: move printing of merge result to extension The `mercurial.simplemerge` module still has some command-lines processing that doesn't belong in such a low-level module. This patch moves the handling of `hg simplemerge --print` to the extension by having `mercurial.simplemerge.simplemerge()` return the merged text. Differential Revision: https://phab.mercurial-scm.org/D12148

     1

from __future__ import absolute_import, print_function

     2

     3

import sys

     4

     5

for line in sys.stdin:

     6

    if line.lower() in ("message-id: \n", "in-reply-to: \n"):

     7

        line = line[:-2]

     8

    print(line, end="")