tests/test-config-env.py.out
author Martin von Zweigbergk <martinvonz@google.com>
Fri, 14 Jan 2022 08:17:13 -0800
changeset 48755 6ae3c97a0919
parent 31685 d83e51654c8a
permissions -rw-r--r--
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

pager.pager=p0 # $TESTTMP/sysrc:4
ui.editor=e1 # $TESTTMP/userrc:2

pager.pager=p2 # $PAGER
ui.editor=e1 # $TESTTMP/userrc:2