Mercurial > hg
view tests/test-config-env.py.out @ 48584:74973a6d4e67
filemerge: always define a "base" label
It simplifies the code and improves the conflict markers to always
have the "base" label defined.
Differential Revision: https://phab.mercurial-scm.org/D12016
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Thu, 20 Jan 2022 14:13:12 -0800 |
parents | d83e51654c8a |
children |
line wrap: on
line source
pager.pager=p0 # $TESTTMP/sysrc:4 ui.editor=e1 # $TESTTMP/userrc:2 pager.pager=p2 # $PAGER ui.editor=e1 # $TESTTMP/userrc:2