Mercurial > hg

annotate tests/test-config-env.py.out @ 48584:74973a6d4e67

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
31685
d83e51654c8a rcutil: let environ override system configs (BC)
Jun Wu <quark@fb.com>
parents:
diff changeset
1 pager.pager=p0 # $TESTTMP/sysrc:4
d83e51654c8a rcutil: let environ override system configs (BC)
Jun Wu <quark@fb.com>
parents:
diff changeset
2 ui.editor=e1 # $TESTTMP/userrc:2
d83e51654c8a rcutil: let environ override system configs (BC)
Jun Wu <quark@fb.com>
parents:
diff changeset
3
d83e51654c8a rcutil: let environ override system configs (BC)
Jun Wu <quark@fb.com>
parents:
diff changeset
4 pager.pager=p2 # $PAGER
d83e51654c8a rcutil: let environ override system configs (BC)
Jun Wu <quark@fb.com>
parents:
diff changeset
5 ui.editor=e1 # $TESTTMP/userrc:2
d83e51654c8a rcutil: let environ override system configs (BC)
Jun Wu <quark@fb.com>
parents:
diff changeset
6